diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /spec/services/git | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/services/git')
-rw-r--r-- | spec/services/git/branch_hooks_service_spec.rb | 28 | ||||
-rw-r--r-- | spec/services/git/wiki_push_service_spec.rb | 8 |
2 files changed, 11 insertions, 25 deletions
diff --git a/spec/services/git/branch_hooks_service_spec.rb b/spec/services/git/branch_hooks_service_spec.rb index 52df21897b9..19694a0a354 100644 --- a/spec/services/git/branch_hooks_service_spec.rb +++ b/spec/services/git/branch_hooks_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Git::BranchHooksService do +RSpec.describe Git::BranchHooksService, :clean_gitlab_redis_shared_state do include RepoHelpers include ProjectForksHelper @@ -116,8 +116,6 @@ RSpec.describe Git::BranchHooksService do allow_next_instance_of(Gitlab::Git::Diff) do |diff| allow(diff).to receive(:new_path).and_return('.gitlab-ci.yml') end - - allow(Gitlab::UsageDataCounters::HLLRedisCounter).to receive(:track_event) end let!(:commit_author) { create(:user, email: sample_commit.author_email) } @@ -127,23 +125,11 @@ RSpec.describe Git::BranchHooksService do end it 'tracks the event' do - execute_service - - expect(Gitlab::UsageDataCounters::HLLRedisCounter) - .to have_received(:track_event).with(*tracking_params) - end - - context 'when the FF usage_data_unique_users_committing_ciconfigfile is disabled' do - before do - stub_feature_flags(usage_data_unique_users_committing_ciconfigfile: false) - end + time = Time.zone.now - it 'does not track the event' do - execute_service + execute_service - expect(Gitlab::UsageDataCounters::HLLRedisCounter) - .not_to have_received(:track_event).with(*tracking_params) - end + expect(Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(event_names: 'o_pipeline_authoring_unique_users_committing_ciconfigfile', start_date: time, end_date: time + 7.days)).to eq(1) end context 'when usage ping is disabled' do @@ -155,7 +141,7 @@ RSpec.describe Git::BranchHooksService do execute_service expect(Gitlab::UsageDataCounters::HLLRedisCounter) - .not_to have_received(:track_event).with(*tracking_params) + .not_to receive(:track_event).with(*tracking_params) end end @@ -166,7 +152,7 @@ RSpec.describe Git::BranchHooksService do execute_service expect(Gitlab::UsageDataCounters::HLLRedisCounter) - .not_to have_received(:track_event).with(*tracking_params) + .not_to receive(:track_event).with(*tracking_params) end end @@ -179,7 +165,7 @@ RSpec.describe Git::BranchHooksService do execute_service expect(Gitlab::UsageDataCounters::HLLRedisCounter) - .not_to have_received(:track_event).with(*tracking_params) + .not_to receive(:track_event).with(*tracking_params) end end end diff --git a/spec/services/git/wiki_push_service_spec.rb b/spec/services/git/wiki_push_service_spec.rb index df9a48d7b1c..151c2a1d014 100644 --- a/spec/services/git/wiki_push_service_spec.rb +++ b/spec/services/git/wiki_push_service_spec.rb @@ -51,7 +51,7 @@ RSpec.describe Git::WikiPushService, services: true do process_changes do write_new_page update_page(wiki_page_a.title) - delete_page(wiki_page_b.page.path) + delete_page(wiki_page_b.page) end end @@ -198,7 +198,7 @@ RSpec.describe Git::WikiPushService, services: true do context 'when a page we do not know about has been deleted' do def run_service wiki_page = create(:wiki_page, wiki: wiki) - process_changes { delete_page(wiki_page.page.path) } + process_changes { delete_page(wiki_page.page) } end it 'create a new meta-data record' do @@ -350,8 +350,8 @@ RSpec.describe Git::WikiPushService, services: true do git_wiki.update_page(page.path, title, 'markdown', 'Hey', commit_details) end - def delete_page(path) - git_wiki.delete_page(path, commit_details) + def delete_page(page) + wiki.delete_page(page, 'commit message') end def commit_details |