From ce9310d63f6ddf55187d16b882d59f26f7b384a9 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 27 Apr 2016 09:28:08 +0200 Subject: [PATCH 1/3] fix var error --- lib/gitlab/bitbucket_import/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/bitbucket_import/client.rb b/lib/gitlab/bitbucket_import/client.rb index 9bb507b5edd..9b83292ef33 100644 --- a/lib/gitlab/bitbucket_import/client.rb +++ b/lib/gitlab/bitbucket_import/client.rb @@ -12,7 +12,7 @@ module Gitlab token_secret = import_data_credentials[:bb_session][:bitbucket_access_token_secret] new(token, token_secret) else - raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{@project.id}" + raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{project.id}" end end From 8793025dd04b7a6c8dd6dd04a52eabbfc612745d Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 28 Apr 2016 10:26:44 +0200 Subject: [PATCH 2/3] added spec testing exception raised --- .../gitlab/bitbucket_import/client_spec.rb | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/spec/lib/gitlab/bitbucket_import/client_spec.rb b/spec/lib/gitlab/bitbucket_import/client_spec.rb index aa0699f2ebf..cd31894eda6 100644 --- a/spec/lib/gitlab/bitbucket_import/client_spec.rb +++ b/spec/lib/gitlab/bitbucket_import/client_spec.rb @@ -34,18 +34,33 @@ describe Gitlab::BitbucketImport::Client, lib: true do it 'retrieves issues over a number of pages' do stub_request(:get, "https://bitbucket.org/api/1.0/repositories/#{project_id}/issues?limit=50&sort=utc_created_on&start=0"). - to_return(status: 200, - body: first_sample_data.to_json, - headers: {}) + to_return(status: 200, + body: first_sample_data.to_json, + headers: {}) stub_request(:get, "https://bitbucket.org/api/1.0/repositories/#{project_id}/issues?limit=50&sort=utc_created_on&start=50"). - to_return(status: 200, - body: second_sample_data.to_json, - headers: {}) + to_return(status: 200, + body: second_sample_data.to_json, + headers: {}) issues = client.issues(project_id) expect(issues.count).to eq(95) end end + + context 'project import' do + it 'calls .from_project with no errors' do + project = create(:empty_project) + project.create_or_update_import_data(credentials: + { :user => "git", + :password => nil, + :bb_session => + { :bitbucket_access_token => "test", + :bitbucket_access_token_secret => "test" } }) + project.import_url = "ssh://git@bitbucket.org/test/test.git" + + expect { described_class.from_project(project) }.to_not raise_error + end + end end From 9a9681772c3c8a6523bb94e758655e5c555cea91 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 28 Apr 2016 11:40:23 +0200 Subject: [PATCH 3/3] fix failing spec --- spec/lib/gitlab/bitbucket_import/client_spec.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spec/lib/gitlab/bitbucket_import/client_spec.rb b/spec/lib/gitlab/bitbucket_import/client_spec.rb index cd31894eda6..af839f42421 100644 --- a/spec/lib/gitlab/bitbucket_import/client_spec.rb +++ b/spec/lib/gitlab/bitbucket_import/client_spec.rb @@ -53,11 +53,10 @@ describe Gitlab::BitbucketImport::Client, lib: true do it 'calls .from_project with no errors' do project = create(:empty_project) project.create_or_update_import_data(credentials: - { :user => "git", - :password => nil, - :bb_session => - { :bitbucket_access_token => "test", - :bitbucket_access_token_secret => "test" } }) + { user: "git", + password: nil, + bb_session: { bitbucket_access_token: "test", + bitbucket_access_token_secret: "test" } }) project.import_url = "ssh://git@bitbucket.org/test/test.git" expect { described_class.from_project(project) }.to_not raise_error