Add latest changes from gitlab-org/gitlab@master

3 files changed, 1 insertions, 31 deletions

diff --git a/spec/features/dashboard/issues_spec.rb b/spec/features/dashboard/issues_spec.rb
index ff661014fb9..0b2811618b5 100644
--- a/spec/features/dashboard/issues_spec.rb
+++ b/spec/features/dashboard/issues_spec.rb
@@ -73,7 +73,7 @@ RSpec.describe 'Dashboard Issues' do
 
       find('.new-project-item-link').click
 
-      expect(page).to have_current_path("#{project_path}/issues/new")
+      expect(page).to have_current_path("#{project_path}/-/issues/new")
 
       page.within('#content-body') do
         expect(page).to have_selector('.issue-form')
diff --git a/spec/features/projects/snippets/user_updates_snippet_spec.rb b/spec/features/projects/snippets/user_updates_snippet_spec.rb
index 743823a545a..6d30a6696c6 100644
--- a/spec/features/projects/snippets/user_updates_snippet_spec.rb
+++ b/spec/features/projects/snippets/user_updates_snippet_spec.rb
@@ -7,12 +7,9 @@ describe 'Projects > Snippets > User updates a snippet', :js do
   let_it_be(:project) { create(:project, namespace: user.namespace) }
   let_it_be(:snippet, reload: true) { create(:project_snippet, :repository, project: project, author: user) }
 
-  let(:version_snippet_enabled) { true }
-
   before do
     stub_feature_flags(snippets_vue: false)
     stub_feature_flags(snippets_edit_vue: false)
-    stub_feature_flags(version_snippets: version_snippet_enabled)
 
     project.add_maintainer(user)
     sign_in(user)
@@ -35,18 +32,6 @@ describe 'Projects > Snippets > User updates a snippet', :js do
     end
   end
 
-  context 'when feature flag :version_snippets is disabled' do
-    let(:version_snippet_enabled) { false }
-
-    it 'displays the snippet file_name and content' do
-      aggregate_failures do
-        expect(page.find_field('project_snippet_file_name').value).to eq snippet.file_name
-        expect(page.find('.file-content')).to have_content(snippet.content)
-        expect(page.find('.snippet-file-content', visible: false).value).to eq snippet.content
-      end
-    end
-  end
-
   it 'updates a snippet' do
     fill_in('project_snippet_title', with: 'Snippet new title')
     click_button('Save')
diff --git a/spec/features/snippets/user_edits_snippet_spec.rb b/spec/features/snippets/user_edits_snippet_spec.rb
index 76d658a21c6..98f0f75c818 100644
--- a/spec/features/snippets/user_edits_snippet_spec.rb
+++ b/spec/features/snippets/user_edits_snippet_spec.rb
@@ -10,12 +10,9 @@ describe 'User edits snippet', :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:snippet, reload: true) { create(:personal_snippet, :repository, :public, file_name: file_name, content: content, author: user) }
 
-  let(:version_snippet_enabled) { true }
-
   before do
     stub_feature_flags(snippets_vue: false)
     stub_feature_flags(snippets_edit_vue: false)
-    stub_feature_flags(version_snippets: version_snippet_enabled)
 
     sign_in(user)
 
@@ -33,18 +30,6 @@ describe 'User edits snippet', :js do
     end
   end
 
-  context 'when feature flag :version_snippets is disabled' do
-    let(:version_snippet_enabled) { false }
-
-    it 'displays the snippet file_name and content' do
-      aggregate_failures do
-        expect(page.find_field('personal_snippet_file_name').value).to eq file_name
-        expect(page.find('.file-content')).to have_content(content)
-        expect(page.find('.snippet-file-content', visible: false).value).to eq content
-      end
-    end
-  end
-
   it 'updates the snippet' do
     fill_in 'personal_snippet_title', with: 'New Snippet Title'