Commit e1aab74f authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'id-project-for-in-tests' into 'master'

Stub DetectRepositoryLanguagesWorker for all tests

See merge request gitlab-org/gitlab-ce!32430
parents ab27d66a 8dcddb98
......@@ -456,6 +456,10 @@ class Repository
def after_import
expire_content_cache
# This call is stubbed in tests due to being an expensive operation
# It can be reenabled for specific tests via:
#
# allow(DetectRepositoryLanguagesWorker).to receive(:perform_async).and_call_original
DetectRepositoryLanguagesWorker.perform_async(project.id)
end
......
......@@ -5,6 +5,8 @@ shared_examples 'languages and percentages JSON response' do
let(:expected_languages) { project.repository.languages.map { |language| language.values_at(:label, :value)}.to_h }
before do
allow(DetectRepositoryLanguagesWorker).to receive(:perform_async).and_call_original
allow(project.repository).to receive(:languages).and_return(
[{ value: 66.69, label: "Ruby", color: "#701516", highlight: "#701516" },
{ value: 22.98, label: "JavaScript", color: "#f1e05a", highlight: "#f1e05a" },
......
......@@ -148,6 +148,12 @@ RSpec.configure do |config|
.with(:force_autodevops_on_by_default, anything)
.and_return(false)
# Stub this call due to being an expensive operation
# It can be reenabled for specific tests via:
#
# allow(DetectRepositoryLanguagesWorker).to receive(:perform_async).and_call_original
allow(DetectRepositoryLanguagesWorker).to receive(:perform_async).and_return(true)
Gitlab::ThreadMemoryCache.cache_backend.clear
end
......
......@@ -45,7 +45,7 @@ module ProjectForksHelper
# not reset the @exists variable of this forked_project.repository
# so we have to explicitly call this method to clear the @exists variable.
# of the instance we're returning here.
forked_project.repository.after_import
forked_project.repository.expire_content_cache
end
forked_project
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment