Add specs for invalid repos

app/controllers/import/bitbucket_controller.rb

@@ -82,7 +82,7 @@ class Import::BitbucketController < Import::BaseController
   def importable_repos
     already_added_projects_names = already_added_projects.map(&:import_source)
 
-    bitbucket_repos.reject { |repo| (already_added_projects_names.include? repo.full_name) || !repo.valid? }
+    bitbucket_repos.reject { |repo| already_added_projects_names.include?(repo.full_name) || !repo.valid? }
   end
   # rubocop: enable CodeReuse/ActiveRecord
 

spec/controllers/import/bitbucket_controller_spec.rb

@@ -57,6 +57,8 @@ RSpec.describe Import::BitbucketController do
   describe "GET status" do
     before do
       @repo = double(name: 'vim', slug: 'vim', owner: 'asd', full_name: 'asd/vim', clone_url: 'http://test.host/demo/url.git', 'valid?' => true)
+      @invalid_repo = double(name: 'mercurialrepo', slug: 'mercurialrepo', owner: 'asd', full_name: 'asd/mercurialrepo', clone_url: 'http://test.host/demo/mercurialrepo.git', 'valid?' => false)
+
       assign_session_tokens
       stub_feature_flags(new_import_ui: false)
     end
@@ -73,6 +75,25 @@ RSpec.describe Import::BitbucketController do
       let(:client_repos_field) { :repos }
     end
 
+    context 'with new_import_ui feature flag enabled' do
+      before do
+        stub_feature_flags(new_import_ui: true)
+        allow(controller).to receive(:provider_url).and_return('http://demobitbucket.org')
+      end
+
+      it 'returns invalid repos' do
+        allow_any_instance_of(Bitbucket::Client).to receive(:repos).and_return([@repo, @invalid_repo])
+
+        get :status, format: :json
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response['incompatible_repos'].length).to eq(1)
+        expect(json_response.dig("incompatible_repos", 0, "id")).to eq(@invalid_repo.full_name)
+        expect(json_response['provider_repos'].length).to eq(1)
+        expect(json_response.dig("provider_repos", 0, "id")).to eq(@repo.full_name)
+      end
+    end
+
     it "assigns variables" do
       @project = create(:project, import_type: 'bitbucket', creator_id: user.id)
       allow_any_instance_of(Bitbucket::Client).to receive(:repos).and_return([@repo])

spec/controllers/import/bitbucket_server_controller_spec.rb

@@ -142,12 +142,30 @@ RSpec.describe Import::BitbucketServerController do
       allow(controller).to receive(:client).and_return(client)
 
       @repo = double(slug: 'vim', project_key: 'asd', full_name: 'asd/vim', "valid?" => true, project_name: 'asd', browse_url: 'http://test', name: 'vim')
-      @invalid_repo = double(slug: 'invalid', project_key: 'foobar', full_name: 'asd/foobar', "valid?" => false, browse_url: 'http://bad-repo')
+      @invalid_repo = double(slug: 'invalid', project_key: 'foobar', full_name: 'asd/foobar', "valid?" => false, browse_url: 'http://bad-repo', name: 'invalid')
       @created_repo = double(slug: 'created', project_key: 'existing', full_name: 'group/created', "valid?" => true, browse_url: 'http://existing')
       assign_session_tokens
       stub_feature_flags(new_import_ui: false)
     end
 
+    context 'with new_import_ui feature flag enabled' do
+      before do
+        stub_feature_flags(new_import_ui: true)
+      end
+
+      it 'returns invalid repos' do
+        allow(client).to receive(:repos).with(filter: nil, limit: 25, page_offset: 0).and_return([@repo, @invalid_repo])
+
+        get :status, format: :json
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response['incompatible_repos'].length).to eq(1)
+        expect(json_response.dig("incompatible_repos", 0, "id")).to eq(@invalid_repo.full_name)
+        expect(json_response['provider_repos'].length).to eq(1)
+        expect(json_response.dig("provider_repos", 0, "id")).to eq(@repo.full_name)
+      end
+    end
+
     it_behaves_like 'import controller with new_import_ui feature flag' do
       let(:repo) { @repo }
       let(:repo_id) { @repo.full_name }