1 files changed, 19 insertions, 43 deletions
diff --git a/spec/lib/gitlab/github_import/clients/proxy_spec.rb b/spec/lib/gitlab/github_import/clients/proxy_spec.rb
index 0baff7bafcb..5f785ae20b0 100644
--- a/spec/lib/gitlab/github_import/clients/proxy_spec.rb
+++ b/spec/lib/gitlab/github_import/clients/proxy_spec.rb
@@ -15,54 +15,30 @@ RSpec.describe Gitlab::GithubImport::Clients::Proxy, :manage, feature_category:
     context 'when remove_legacy_github_client FF is enabled' do
       let(:client_stub) { instance_double(Gitlab::GithubImport::Client) }
 
-      context 'with github_client_fetch_repos_via_graphql FF enabled' do
-        let(:client_response) do
-          {
-            data: {
-              search: {
-                nodes: [{ name: 'foo' }, { name: 'bar' }],
-                pageInfo: { startCursor: 'foo', endCursor: 'bar' }
-              }
+      let(:client_response) do
+        {
+          data: {
+            search: {
+              nodes: [{ name: 'foo' }, { name: 'bar' }],
+              pageInfo: { startCursor: 'foo', endCursor: 'bar' }
             }
           }
-        end
-
-        it 'fetches repos with Gitlab::GithubImport::Client (GraphQL API)' do
-          expect(Gitlab::GithubImport::Client)
-            .to receive(:new).with(access_token).and_return(client_stub)
-          expect(client_stub)
-            .to receive(:search_repos_by_name_graphql)
-            .with(search_text, pagination_options).and_return(client_response)
-
-          expect(client.repos(search_text, pagination_options)).to eq(
-            {
-              repos: [{ name: 'foo' }, { name: 'bar' }],
-              page_info: { startCursor: 'foo', endCursor: 'bar' }
-            }
-          )
-        end
+        }
       end
 
-      context 'with github_client_fetch_repos_via_graphql FF disabled' do
-        let(:client_response) do
-          { items: [{ name: 'foo' }, { name: 'bar' }] }
-        end
+      it 'fetches repos with Gitlab::GithubImport::Client (GraphQL API)' do
+        expect(Gitlab::GithubImport::Client)
+          .to receive(:new).with(access_token).and_return(client_stub)
+        expect(client_stub)
+          .to receive(:search_repos_by_name_graphql)
+          .with(search_text, pagination_options).and_return(client_response)
 
-        before do
-          stub_feature_flags(github_client_fetch_repos_via_graphql: false)
-        end
-
-        it 'fetches repos with Gitlab::GithubImport::Client (REST API)' do
-          expect(Gitlab::GithubImport::Client)
-            .to receive(:new).with(access_token).and_return(client_stub)
-          expect(client_stub)
-            .to receive(:search_repos_by_name)
-            .with(search_text, pagination_options).and_return(client_response)
-
-          expect(client.repos(search_text, pagination_options)).to eq(
-            { repos: [{ name: 'foo' }, { name: 'bar' }] }
-          )
-        end
+        expect(client.repos(search_text, pagination_options)).to eq(
+          {
+            repos: [{ name: 'foo' }, { name: 'bar' }],
+            page_info: { startCursor: 'foo', endCursor: 'bar' }
+          }
+        )
       end
     end