Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 15 deletions

diff --git a/spec/views/projects/show.html.haml_spec.rb b/spec/views/projects/show.html.haml_spec.rb
index 820772b592f..4f5f0f0285c 100644
--- a/spec/views/projects/show.html.haml_spec.rb
+++ b/spec/views/projects/show.html.haml_spec.rb
@@ -18,6 +18,14 @@ describe 'projects/show' do
   end
 
   context 'commit signatures' do
+    context 'with vue tree view enabled' do
+      it 'are not rendered via js-signature-container' do
+        render
+
+        expect(rendered).not_to have_css('.js-signature-container')
+      end
+    end
+
     context 'with vue tree view disabled' do
       before do
         stub_feature_flags(vue_file_list: false)
@@ -29,13 +37,5 @@ describe 'projects/show' do
         expect(rendered).to have_css('.js-signature-container')
       end
     end
-
-    context 'with vue tree view enabled' do
-      it 'are not rendered via js-signature-container' do
-        render
-
-        expect(rendered).not_to have_css('.js-signature-container')
-      end
-    end
   end
 end
diff --git a/spec/views/projects/tree/show.html.haml_spec.rb b/spec/views/projects/tree/show.html.haml_spec.rb
index 4307d1b49c9..8c6b229247d 100644
--- a/spec/views/projects/tree/show.html.haml_spec.rb
+++ b/spec/views/projects/tree/show.html.haml_spec.rb
@@ -13,8 +13,6 @@ describe 'projects/tree/show' do
   let(:tree) { repository.tree(commit.id, path) }
 
   before do
-    stub_feature_flags(vue_file_list: false)
-
     assign(:project, project)
     assign(:repository, repository)
     assign(:lfs_blob_ids, [])
@@ -39,12 +37,15 @@ describe 'projects/tree/show' do
       render
 
       expect(rendered).to have_css('.js-project-refs-dropdown .dropdown-toggle-text', text: ref)
-      expect(rendered).to have_css('.readme-holder')
     end
   end
 
   context 'commit signatures' do
     context 'with vue tree view disabled' do
+      before do
+        stub_feature_flags(vue_file_list: false)
+      end
+
       it 'rendered via js-signature-container' do
         render
 
@@ -53,10 +54,6 @@ describe 'projects/tree/show' do
     end
 
     context 'with vue tree view enabled' do
-      before do
-        stub_feature_flags(vue_file_list: true)
-      end
-
       it 'are not rendered via js-signature-container' do
         render