Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master'

Disable navigation to Pages config if Pages is disabled

Closes #30529

See merge request !11008

4 files changed, 20 insertions, 20 deletions

diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index 0d6f7350181..34201cd8486 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -63,13 +63,6 @@ Feature: Project Active Tab
     And no other sub tabs should be active
     And the active main tab should be Settings
 
-  Scenario: On Project Settings/Pages
-    Given I visit my project's settings page
-    And I click the "Pages" tab
-    Then the active sub tab should be Pages
-    And no other sub tabs should be active
-    And the active main tab should be Settings
-
   Scenario: On Project Members
     Given I visit my project's members page
     Then the active sub tab should be Members
diff --git a/features/project/pages.feature b/features/project/pages.feature
index 87d88348d09..56e47287b5c 100644
--- a/features/project/pages.feature
+++ b/features/project/pages.feature
@@ -3,10 +3,15 @@ Feature: Project Pages
     Given I sign in as a user
     And I own a project
 
-  Scenario: Pages are disabled
+  Scenario: I cannot navigate to Pages settings if pages enabled
     Given pages are disabled
-    When I visit the Project Pages
-    Then I should see that GitLab Pages are disabled
+    And I visit my project's settings page
+    Then I should not see the "Pages" tab
+
+  Scenario: I can navigate to Pages settings if pages enabled
+    Given pages are enabled
+    And I visit my project's settings page
+    Then I should see the "Pages" tab
 
   Scenario: I can see the pages usage if not deployed
     Given pages are enabled
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 4befd49ac81..5cd9bd38c9d 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -39,12 +39,6 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
     end
   end
 
-  step 'I click the "Pages" tab' do
-    page.within '.sub-nav' do
-      click_link('Pages')
-    end
-  end
-
   step 'I click the "Activity" tab' do
     page.within '.sub-nav' do
       click_link('Activity')
diff --git a/features/steps/project/pages.rb b/features/steps/project/pages.rb
index 4045955a8b9..fea82d9fb57 100644
--- a/features/steps/project/pages.rb
+++ b/features/steps/project/pages.rb
@@ -18,14 +18,22 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
     visit namespace_project_pages_path(@project.namespace, @project)
   end
 
-  step 'I should see that GitLab Pages are disabled' do
-    expect(page).to have_content('GitLab Pages are disabled')
-  end
-
   step 'I should see the usage of GitLab Pages' do
     expect(page).to have_content('Configure pages')
   end
 
+  step 'I should see the "Pages" tab' do
+    page.within '.sub-nav' do
+      expect(page).to have_link('Pages')
+    end
+  end
+
+  step 'I should not see the "Pages" tab' do
+    page.within '.sub-nav' do
+      expect(page).not_to have_link('Pages')
+    end
+  end
+
   step 'pages are deployed' do
     pipeline = @project.ensure_pipeline('HEAD', @project.commit('HEAD').sha)
     build = build(:ci_build,