diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/services/git/wiki_push_service_spec.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/services/git/wiki_push_service_spec.rb')
-rw-r--r-- | spec/services/git/wiki_push_service_spec.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/spec/services/git/wiki_push_service_spec.rb b/spec/services/git/wiki_push_service_spec.rb index cdb1dc5a435..b2234c81c24 100644 --- a/spec/services/git/wiki_push_service_spec.rb +++ b/spec/services/git/wiki_push_service_spec.rb @@ -54,7 +54,7 @@ describe Git::WikiPushService, services: true do it 'handles all known actions' do run_service - expect(Event.last(count).pluck(:action)).to match_array(Event::WIKI_ACTIONS) + expect(Event.last(count).pluck(:action)).to match_array(Event::WIKI_ACTIONS.map(&:to_s)) end end @@ -77,7 +77,7 @@ describe Git::WikiPushService, services: true do it 'creates appropriate events' do run_service - expect(Event.last(2)).to all(have_attributes(wiki_page?: true, action: Event::CREATED)) + expect(Event.last(2)).to all(have_attributes(wiki_page?: true, action: 'created')) end end @@ -100,7 +100,7 @@ describe Git::WikiPushService, services: true do it 'creates a wiki page creation event' do expect { run_service }.to change(Event, :count).by(1) - expect(Event.last).to have_attributes(wiki_page?: true, action: Event::CREATED) + expect(Event.last).to have_attributes(wiki_page?: true, action: 'created') end it 'creates one metadata record' do @@ -129,7 +129,7 @@ describe Git::WikiPushService, services: true do expect(Event.last).to have_attributes( wiki_page?: true, - action: Event::CREATED + action: 'created' ) end end @@ -158,7 +158,7 @@ describe Git::WikiPushService, services: true do expect(Event.last).to have_attributes( wiki_page?: true, - action: Event::UPDATED + action: 'updated' ) end end @@ -182,7 +182,7 @@ describe Git::WikiPushService, services: true do expect(Event.last).to have_attributes( wiki_page?: true, - action: Event::UPDATED + action: 'updated' ) end end @@ -206,7 +206,7 @@ describe Git::WikiPushService, services: true do expect(Event.last).to have_attributes( wiki_page?: true, - action: Event::DESTROYED + action: 'destroyed' ) end end @@ -218,7 +218,7 @@ describe Git::WikiPushService, services: true do message = 'something went very very wrong' allow_next_instance_of(WikiPages::EventCreateService, current_user) do |service| allow(service).to receive(:execute) - .with(String, WikiPage, Integer) + .with(String, WikiPage, Symbol) .and_return(ServiceResponse.error(message: message)) end |