Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 30 deletions

diff --git a/spec/features/projects/pages/user_configures_pages_pipeline_spec.rb b/spec/features/projects/pages/user_configures_pages_pipeline_spec.rb
index 76eec8097d3..eb7bcb38d38 100644
--- a/spec/features/projects/pages/user_configures_pages_pipeline_spec.rb
+++ b/spec/features/projects/pages/user_configures_pages_pipeline_spec.rb
@@ -15,45 +15,23 @@ RSpec.describe 'Pages edits pages settings', :js, feature_category: :pages do
     sign_in(user)
   end
 
-  context 'when pipeline wizard feature is enabled' do
-    before do
-      Feature.enable(:use_pipeline_wizard_for_pages)
-    end
-
-    context 'when onboarding is not complete' do
-      it 'renders onboarding instructions' do
-        visit project_pages_path(project)
-
-        expect(page).to have_content('Get started with GitLab Pages')
-      end
-    end
-
-    context 'when onboarding is complete' do
-      before do
-        project.mark_pages_onboarding_complete
-      end
-
-      it 'shows waiting screen' do
-        visit project_pages_path(project)
+  context 'when onboarding is not complete' do
+    it 'renders onboarding instructions' do
+      visit project_pages_path(project)
 
-        expect(page).to have_content('Waiting for the Pages Pipeline to complete...')
-      end
+      expect(page).to have_content('Get started with GitLab Pages')
     end
   end
 
-  context 'when pipeline wizard feature is disabled' do
+  context 'when onboarding is complete' do
     before do
-      Feature.disable(:use_pipeline_wizard_for_pages)
-    end
-
-    after do
-      Feature.enable(:use_pipeline_wizard_for_pages)
+      project.mark_pages_onboarding_complete
     end
 
-    it 'shows configure pages instructions' do
+    it 'shows waiting screen' do
       visit project_pages_path(project)
 
-      expect(page).to have_content('Configure pages')
+      expect(page).to have_content('Waiting for the Pages Pipeline to complete...')
     end
   end
 end