1 files changed, 80 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..7b2a8fa9d74 100644
--- a/spec/lib/gitlab/github_import/clients/proxy_spec.rb
+++ b/spec/lib/gitlab/github_import/clients/proxy_spec.rb
@@ -8,6 +8,10 @@ RSpec.describe Gitlab::GithubImport::Clients::Proxy, :manage, feature_category:
   let(:access_token) { 'test_token' }
   let(:client_options) { { foo: :bar } }
 
+  it { expect(client).to delegate_method(:each_object).to(:client) }
+  it { expect(client).to delegate_method(:user).to(:client) }
+  it { expect(client).to delegate_method(:octokit).to(:client) }
+
   describe '#repos' do
     let(:search_text) { 'search text' }
     let(:pagination_options) { { limit: 10 } }
@@ -15,54 +19,32 @@ 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' },
+              repositoryCount: 2
             }
           }
-        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
-
-        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)
+      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' }] }
-          )
-        end
+        expect(client.repos(search_text, pagination_options)).to eq(
+          {
+            repos: [{ name: 'foo' }, { name: 'bar' }],
+            page_info: { startCursor: 'foo', endCursor: 'bar' },
+            count: 2
+          }
+        )
       end
     end
 
@@ -99,4 +81,59 @@ RSpec.describe Gitlab::GithubImport::Clients::Proxy, :manage, feature_category:
       end
     end
   end
+
+  describe '#count_by', :clean_gitlab_redis_cache do
+    context 'when remove_legacy_github_client FF is enabled' do
+      let(:client_stub) { instance_double(Gitlab::GithubImport::Client) }
+      let(:client_response) { { data: { search: { repositoryCount: 1 } } } }
+
+      before do
+        stub_feature_flags(remove_legacy_github_client: true)
+      end
+
+      context 'when value is cached' do
+        before do
+          Gitlab::Cache::Import::Caching.write('github-importer/provider-repo-count/owned/user_id', 3)
+        end
+
+        it 'returns repository count from cache' do
+          expect(Gitlab::GithubImport::Client)
+            .to receive(:new).with(access_token).and_return(client_stub)
+          expect(client_stub)
+            .not_to receive(:count_repos_by_relation_type_graphql)
+            .with({ relation_type: 'owned' })
+          expect(client.count_repos_by('owned', 'user_id')).to eq(3)
+        end
+      end
+
+      context 'when value is not cached' do
+        it 'returns repository count' do
+          expect(Gitlab::GithubImport::Client)
+            .to receive(:new).with(access_token).and_return(client_stub)
+          expect(client_stub)
+            .to receive(:count_repos_by_relation_type_graphql)
+            .with({ relation_type: 'owned' }).and_return(client_response)
+          expect(Gitlab::Cache::Import::Caching)
+            .to receive(:write)
+            .with('github-importer/provider-repo-count/owned/user_id', 1, timeout: 5.minutes)
+            .and_call_original
+          expect(client.count_repos_by('owned', 'user_id')).to eq(1)
+        end
+      end
+    end
+
+    context 'when remove_legacy_github_client FF is disabled' do
+      let(:client_stub) { instance_double(Gitlab::LegacyGithubImport::Client) }
+
+      before do
+        stub_feature_flags(remove_legacy_github_client: false)
+      end
+
+      it 'returns nil' do
+        expect(Gitlab::LegacyGithubImport::Client)
+          .to receive(:new).with(access_token, client_options).and_return(client_stub)
+        expect(client.count_repos_by('owned', 'user_id')).to be_nil
+      end
+    end
+  end
 end