Rename methods that conflict in Rails 5.255583-rename-method-conflicts

Adds suffix to enum methods and changes `in_groups` to
`of_groups`

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index e91b5c4c86f..62663c247d1 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -88,7 +88,7 @@ describe Event do
     let(:event) { create_push_event(project, user) }
 
     it do
-      expect(event.push?).to be_truthy
+      expect(event.push_action?).to be_truthy
       expect(event.visible_to_user?(user)).to be_truthy
       expect(event.visible_to_user?(nil)).to be_falsey
       expect(event.tag?).to be_falsey
diff --git a/spec/models/push_event_spec.rb b/spec/models/push_event_spec.rb
index f86500f91cd..5509ed87308 100644
--- a/spec/models/push_event_spec.rb
+++ b/spec/models/push_event_spec.rb
@@ -123,9 +123,9 @@ describe PushEvent do
     end
   end
 
-  describe '#push?' do
+  describe '#push_action?' do
     it 'returns true' do
-      expect(event).to be_push
+      expect(event).to be_push_action
     end
   end