Merge branch 'merge-issues-settings-spec' into 'master'

Merge two spec files issues_settings_spec.rb into one

See merge request gitlab-org/gitlab-ee!5164

ee/spec/features/projects/settings/issues_settings_spec.rb

 require 'spec_helper'
 
-describe 'Project settings > [EE] Merge Requests', :js do
-  include GitlabRoutingHelper
-
+feature 'Project settings > Issues', :js do
+  let(:project) { create(:project, :public) }
   let(:user) { create(:user) }
-  let(:project) { create(:project, approvals_before_merge: 1) }
 
-  before do
-    gitlab_sign_in(user)
+  background do
     project.add_master(user)
+
+    sign_in(user)
+  end
+
+  context 'when Issues are initially enabled' do
+    context 'when Pipelines are initially enabled' do
+      before do
+        visit edit_project_path(project)
+      end
+
+      scenario 'shows the Issues settings' do
+        expect(page).to have_content('Customize your issue restrictions')
+
+        within('.sharing-permissions-form') do
+          find('.project-feature-controls[data-for="project[project_feature_attributes][issues_access_level]"] .project-feature-toggle').click
+          click_on('Save changes')
+        end
+
+        expect(page).not_to have_content('Customize your issue restrictions')
+      end
+    end
+  end
+
+  context 'when Issues are initially disabled' do
+    before do
+      project.project_feature.update_attribute('issues_access_level', ProjectFeature::DISABLED)
+      visit edit_project_path(project)
+    end
+
+    scenario 'does not show the Issues settings' do
+      expect(page).not_to have_content('Customize your issue restrictions')
+
+      within('.sharing-permissions-form') do
+        find('.project-feature-controls[data-for="project[project_feature_attributes][issues_access_level]"] .project-feature-toggle').click
+        click_on('Save changes')
+      end
+
+      expect(page).to have_content('Customize your issue restrictions')
+    end
   end
 
   context 'issuable default templates feature not available' do

spec/features/projects/settings/issues_settings_spec.rb

-require 'spec_helper'
-
-feature 'Project settings > Issues', :js do
-  let(:project) { create(:project, :public) }
-  let(:user) { create(:user) }
-
-  background do
-    project.add_master(user)
-    sign_in(user)
-  end
-
-  context 'when Issues are initially enabled' do
-    context 'when Pipelines are initially enabled' do
-      before do
-        visit edit_project_path(project)
-      end
-
-      scenario 'shows the Issues settings' do
-        expect(page).to have_content('Customize your issue restrictions')
-
-        within('.sharing-permissions-form') do
-          find('.project-feature-controls[data-for="project[project_feature_attributes][issues_access_level]"] .project-feature-toggle').click
-          click_on('Save changes')
-        end
-
-        expect(page).not_to have_content('Customize your issue restrictions')
-      end
-    end
-  end
-
-  context 'when Issues are initially disabled' do
-    before do
-      project.project_feature.update_attribute('issues_access_level', ProjectFeature::DISABLED)
-      visit edit_project_path(project)
-    end
-
-    scenario 'does not show the Issues settings' do
-      expect(page).not_to have_content('Customize your issue restrictions')
-
-      within('.sharing-permissions-form') do
-        find('.project-feature-controls[data-for="project[project_feature_attributes][issues_access_level]"] .project-feature-toggle').click
-        click_on('Save changes')
-      end
-
-      expect(page).to have_content('Customize your issue restrictions')
-    end
-  end
-end