improvements after CR

2 files changed, 8 insertions, 9 deletions

diff --git a/qa/qa/page/activity/activity.rb b/qa/qa/page/project/activity.rb
index 7970d8186c6..c343266f01d 100644
--- a/qa/qa/page/activity/activity.rb
+++ b/qa/qa/page/project/activity.rb
@@ -1,13 +1,17 @@
 module QA
   module Page
-    module Activity
+    module Project
       class Activity < Page::Base
-        view 'app/views/projects/activity.html.haml' do
+        view 'app/views/shared/_event_filter.html.haml' do
           element :push_events_button, 'Push events'
         end
 
         def go_to_push_events
-          click_button :push_events_button
+          click_link :push_events_button
+        end
+
+        def self.path
+          '/activity'
         end
       end
     end
diff --git a/qa/qa/specs/features/activity/activity_spec.rb b/qa/qa/specs/features/project/activity_spec.rb
index 5eab95c95f3..3dd82bb0587 100644
--- a/qa/qa/specs/features/activity/activity_spec.rb
+++ b/qa/qa/specs/features/project/activity_spec.rb
@@ -4,18 +4,13 @@ module QA
       Runtime::Browser.visit(:gitlab, Page::Main::Login)
       Page::Main::Login.act { sign_in_using_credentials }
 
-      Factory::Resource::Project.fabricate! do |project|
-        project.name = 'awesome-project'
-        project.description = 'create awesome project test'
-      end
-
       Factory::Repository::Push.fabricate! do |push|
         push.file_name = 'README.md'
         push.file_content = '# This is a test project'
         push.commit_message = 'Add README.md'
       end
 
-      Page::Activity::Activity.act { go_to_push_events }
+      Page::Project::Activity.act { go_to_push_events }
 
       expect(page).to have_content('Add README.md')
       expect(page).to have_content('pushed to branch master')