Cleanup and some test fixes after refactoring project home page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

5 files changed, 11 insertions, 2 deletions

diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index a15298fc452..28cc43ef710 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -189,6 +189,7 @@ Feature: Project Issues
     Given I logout
     Given public project "Community"
     When I visit project "Community" page
+    And I visit project "Community" issues page
     And I click link "New Issue"
     And I should not see assignee field
     And I should not see milestone field
diff --git a/features/project/shortcuts.feature b/features/project/shortcuts.feature
index 9567b571120..2369c02806f 100644
--- a/features/project/shortcuts.feature
+++ b/features/project/shortcuts.feature
@@ -53,6 +53,5 @@ Feature: Project Shortcuts
 
   @javascript
   Scenario: Navigate to project feed
-    Given I visit my project's files page
     Given I press "g" and "e"
     Then the active main tab should be Activity
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index 9ace6436b15..239392eab96 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -194,6 +194,11 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
     end
   end
 
+  When "I visit project \"Community\" issues page" do
+    project = Project.find_by(name: 'Community')
+    visit namespace_project_issues_path(project.namespace, project)
+  end
+
   When "I visit empty project's issues page" do
     project = Project.find_by(name: 'Empty Project')
     visit namespace_project_issues_path(project.namespace, project)
diff --git a/features/steps/project/star.rb b/features/steps/project/star.rb
index 8b50bfcef04..bd2e0619cdd 100644
--- a/features/steps/project/star.rb
+++ b/features/steps/project/star.rb
@@ -5,7 +5,7 @@ class Spinach::Features::ProjectStar < Spinach::FeatureSteps
   include SharedUser
 
   step "The project has no stars" do
-    expect(page).not_to have_content '.star-buttons'
+    expect(page).not_to have_content '.toggle-star'
   end
 
   step "The project has 0 stars" do
diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb
index 3b94b7d8621..c67e5e4a06a 100644
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
@@ -49,4 +49,8 @@ module SharedProjectTab
       expect(page).to have_content('Back to project')
     end
   end
+
+  step 'the active main tab should be Activity' do
+    ensure_active_main_tab('Activity')
+  end
 end