Merge branch 'master' into 'focus-mode-board'focus-mode-board

# Conflicts:
#   app/views/shared/issuable/_filter.html.haml

1 files changed, 11 insertions, 19 deletions

diff --git a/spec/features/projects/edit_spec.rb b/spec/features/projects/edit_spec.rb
index a1643fd1f43..7c319af893b 100644
--- a/spec/features/projects/edit_spec.rb
+++ b/spec/features/projects/edit_spec.rb
@@ -21,36 +21,28 @@ feature 'Project edit', feature: true, js: true do
         expect(page).to have_selector('.merge-requests-feature', visible: false)
       end
 
-      it 'hides merge requests section after save' do
-        select('Disabled', from: 'project_project_feature_attributes_merge_requests_access_level')
-
-        expect(page).to have_selector('.merge-requests-feature', visible: false)
-
-        click_button 'Save changes'
+      context 'given project with merge_requests_disabled access level' do
+        let(:project) { create(:project, :merge_requests_disabled) }
 
-        wait_for_ajax
-
-        expect(page).to have_selector('.merge-requests-feature', visible: false)
+        it 'hides merge requests section' do
+          expect(page).to have_selector('.merge-requests-feature', visible: false)
+        end
       end
     end
 
     context 'builds select' do
-      it 'hides merge requests section' do
+      it 'hides builds select section' do
         select('Disabled', from: 'project_project_feature_attributes_builds_access_level')
 
         expect(page).to have_selector('.builds-feature', visible: false)
       end
 
-      it 'hides merge requests section after save' do
-        select('Disabled', from: 'project_project_feature_attributes_builds_access_level')
-
-        expect(page).to have_selector('.builds-feature', visible: false)
+      context 'given project with builds_disabled access level' do
+        let(:project) { create(:project, :builds_disabled) }
 
-        click_button 'Save changes'
-
-        wait_for_ajax
-
-        expect(page).to have_selector('.builds-feature', visible: false)
+        it 'hides builds select section' do
+          expect(page).to have_selector('.builds-feature', visible: false)
+        end
       end
     end
   end