diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-07 01:02:01 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-07 07:07:08 -0700 |
| commit | d7accda1ae42fe2036060aaf3ef4447e8f352e35 (patch) | |
| tree | 0079ec7347a2a68555bc625a53bfe66da44684f9 /spec/controllers/import | |
| parent | a1e6fc157f70f1fe5e8d7b8cc9a34d1ff108b7d8 (diff) | |
| download | gitlab-ce-d7accda1ae42fe2036060aaf3ef4447e8f352e35.tar.gz | |
Show incompatible projects in Bitbucket import status
See #1871
Diffstat (limited to 'spec/controllers/import')
| -rw-r--r-- | spec/controllers/import/bitbucket_controller_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/controllers/import/bitbucket_controller_spec.rb b/spec/controllers/import/bitbucket_controller_spec.rb index d5d9310e603..89e595121a7 100644 --- a/spec/controllers/import/bitbucket_controller_spec.rb +++ b/spec/controllers/import/bitbucket_controller_spec.rb @@ -39,12 +39,14 @@ describe Import::BitbucketController do it "assigns variables" do @project = create(:project, import_type: 'bitbucket', creator_id: user.id) - stub_client(projects: [@repo]) + client = stub_client(projects: [@repo]) + allow(client).to receive(:incompatible_projects).and_return([]) get :status expect(assigns(:already_added_projects)).to eq([@project]) expect(assigns(:repos)).to eq([@repo]) + expect(assigns(:incompatible_repos)).to eq([]) end it "does not show already added project" do |