Commit d435d99f authored by Mikołaj Wawrzyniak's avatar Mikołaj Wawrzyniak

Merge branch '296651-fix-bitbucket-import-project-description' into 'master'

Use Bitbucket repo description over project description when importing

See merge request gitlab-org/gitlab!78160
parents f1562e65 e0399247
......@@ -30,7 +30,7 @@ module BitbucketServer
end
def description
project['description']
raw['description']
end
def full_name
......
......@@ -9,6 +9,7 @@ RSpec.describe BitbucketServer::Representation::Repo do
"slug": "rouge",
"id": 1,
"name": "rouge",
"description": "Rogue Repo",
"scmId": "git",
"state": "AVAILABLE",
"statusMessage": "Available",
......@@ -17,7 +18,7 @@ RSpec.describe BitbucketServer::Representation::Repo do
"key": "TEST",
"id": 1,
"name": "test",
"description": "Test",
"description": "Test Project",
"public": false,
"type": "NORMAL",
"links": {
......@@ -73,7 +74,7 @@ RSpec.describe BitbucketServer::Representation::Repo do
end
describe '#description' do
it { expect(subject.description).to eq('Test') }
it { expect(subject.description).to eq('Rogue Repo') }
end
describe '#full_name' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment