diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-07 17:46:05 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-07 17:46:05 +0300 |
| commit | 0c3170193277320aa2be287b2f5cb7ccac7b4cdf (patch) | |
| tree | 7207e2af990c890bf3cbf8e853f334c9080fc373 /spec | |
| parent | 4773f38e28c91dbbb6e5e385e0c403877298bfed (diff) | |
| parent | d7accda1ae42fe2036060aaf3ef4447e8f352e35 (diff) | |
Merge branch 'bitbucket-show-incompatible' into 'master'
Show incompatible projects in Bitbucket import status
### What does this MR do?
This MR displays incompatible Bitbucket projects (e.g. SVN, hg) in the status table.
### Why was this MR needed?
Users are confused when they don't see projects show up. The import list should show incompatible projects as we do for Google Code to make it more obvious to the user what is happening. (See !586 and 9c76a6fa).
### Screenshot
### What are the relevant issue numbers?
#1871
See merge request !1114
Diffstat (limited to 'spec')
| -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 |