Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 67 deletions

diff --git a/spec/views/groups/settings/_general.html.haml_spec.rb b/spec/views/groups/settings/_general.html.haml_spec.rb
index d58e25c0d99..9f16e43be13 100644
--- a/spec/views/groups/settings/_general.html.haml_spec.rb
+++ b/spec/views/groups/settings/_general.html.haml_spec.rb
@@ -12,28 +12,10 @@ RSpec.describe 'groups/settings/_general.html.haml', feature_category: :subgroup
       allow(view).to receive(:current_user).and_return(user)
     end
 
-    describe 'with :show_group_readme FF true' do
-      before do
-        stub_feature_flags(show_group_readme: true)
-      end
+    it 'renders #js-group-settings-readme' do
+      render
 
-      it 'renders #js-group-settings-readme' do
-        render
-
-        expect(rendered).to have_selector('#js-group-settings-readme')
-      end
-    end
-
-    describe 'with :show_group_readme FF false' do
-      before do
-        stub_feature_flags(show_group_readme: false)
-      end
-
-      it 'does not render #js-group-settings-readme' do
-        render
-
-        expect(rendered).not_to have_selector('#js-group-settings-readme')
-      end
+      expect(rendered).to have_selector('#js-group-settings-readme')
     end
   end
 end
diff --git a/spec/views/groups/show.html.haml_spec.rb b/spec/views/groups/show.html.haml_spec.rb
index 9c876f56771..ac687f68ef6 100644
--- a/spec/views/groups/show.html.haml_spec.rb
+++ b/spec/views/groups/show.html.haml_spec.rb
@@ -11,63 +11,27 @@ RSpec.describe 'groups/show', feature_category: :subgroups do
       assign(:group, group)
     end
 
-    describe 'with :show_group_readme FF true' do
+    context 'with readme project' do
       before do
-        stub_feature_flags(show_group_readme: true)
+        allow(group).to receive(:group_readme).and_return(readme_project)
       end
 
-      context 'with readme project' do
-        before do
-          allow(group).to receive(:group_readme).and_return(readme_project)
-        end
+      it 'renders #js-group-readme' do
+        render
 
-        it 'renders #js-group-readme' do
-          render
-
-          expect(rendered).to have_selector('#js-group-readme')
-        end
-      end
-
-      context 'without readme project' do
-        before do
-          allow(group).to receive(:group_readme).and_return(nil)
-        end
-
-        it 'does not render #js-group-readme' do
-          render
-
-          expect(rendered).not_to have_selector('#js-group-readme')
-        end
+        expect(rendered).to have_selector('#js-group-readme')
       end
     end
 
-    describe 'with :show_group_readme FF false' do
+    context 'without readme project' do
       before do
-        stub_feature_flags(show_group_readme: false)
+        allow(group).to receive(:group_readme).and_return(nil)
       end
 
-      context 'with readme project' do
-        before do
-          allow(group).to receive(:group_readme).and_return(readme_project)
-        end
-
-        it 'does not render #js-group-readme' do
-          render
-
-          expect(rendered).not_to have_selector('#js-group-readme')
-        end
-      end
-
-      context 'without readme project' do
-        before do
-          allow(group).to receive(:group_readme).and_return(nil)
-        end
-
-        it 'does not render #js-group-readme' do
-          render
+      it 'does not render #js-group-readme' do
+        render
 
-          expect(rendered).not_to have_selector('#js-group-readme')
-        end
+        expect(rendered).not_to have_selector('#js-group-readme')
       end
     end
   end