Add latest changes from gitlab-org/gitlab@master

6 files changed, 24 insertions, 38 deletions

diff --git a/spec/features/snippets/internal_snippet_spec.rb b/spec/features/snippets/internal_snippet_spec.rb
index 3ce297ab22d..2fcd11c2a47 100644
--- a/spec/features/snippets/internal_snippet_spec.rb
+++ b/spec/features/snippets/internal_snippet_spec.rb
@@ -3,11 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe 'Internal Snippets', :js do
-  let(:internal_snippet) { create(:personal_snippet, :internal) }
-
-  before do
-    stub_feature_flags(snippets_vue: false)
-  end
+  let(:internal_snippet) { create(:personal_snippet, :internal, :repository) }
+  let(:content) { internal_snippet.blobs.first.data.strip! }
 
   describe 'normal user' do
     before do
@@ -17,13 +14,13 @@ RSpec.describe 'Internal Snippets', :js do
     it 'sees internal snippets' do
       visit snippet_path(internal_snippet)
 
-      expect(page).to have_content(internal_snippet.content)
+      expect(page).to have_content(content)
     end
 
     it 'sees raw internal snippets' do
       visit raw_snippet_path(internal_snippet)
 
-      expect(page).to have_content(internal_snippet.content)
+      expect(page).to have_content(content)
     end
   end
 end
diff --git a/spec/features/snippets/notes_on_personal_snippets_spec.rb b/spec/features/snippets/notes_on_personal_snippets_spec.rb
index e98bb22d3ea..ce9a2d1461e 100644
--- a/spec/features/snippets/notes_on_personal_snippets_spec.rb
+++ b/spec/features/snippets/notes_on_personal_snippets_spec.rb
@@ -18,7 +18,6 @@ RSpec.describe 'Comments on personal snippets', :js do
   end
 
   before do
-    stub_feature_flags(snippets_vue: false)
     sign_in user
     visit snippet_path(snippet)
 
diff --git a/spec/features/snippets/private_snippets_spec.rb b/spec/features/snippets/private_snippets_spec.rb
index 6b45f3485e7..03745c1025a 100644
--- a/spec/features/snippets/private_snippets_spec.rb
+++ b/spec/features/snippets/private_snippets_spec.rb
@@ -4,19 +4,18 @@ require 'spec_helper'
 
 RSpec.describe 'Private Snippets', :js do
   let(:user) { create(:user) }
+  let(:private_snippet) { create(:personal_snippet, :repository, :private, author: user) }
+  let(:content) { private_snippet.blobs.first.data.strip! }
 
   before do
-    stub_feature_flags(snippets_vue: false)
     sign_in(user)
   end
 
   it 'Private Snippet renders for creator' do
-    private_snippet = create(:personal_snippet, :private, author: user)
-
     visit snippet_path(private_snippet)
     wait_for_requests
 
-    expect(page).to have_content(private_snippet.content)
+    expect(page).to have_content(content)
     expect(page).not_to have_css('.js-embed-btn')
     expect(page).not_to have_css('.js-share-btn')
   end
diff --git a/spec/features/snippets/public_snippets_spec.rb b/spec/features/snippets/public_snippets_spec.rb
index 4b72b33245d..d2dc85a9614 100644
--- a/spec/features/snippets/public_snippets_spec.rb
+++ b/spec/features/snippets/public_snippets_spec.rb
@@ -3,27 +3,24 @@
 require 'spec_helper'
 
 RSpec.describe 'Public Snippets', :js do
-  before do
-    stub_feature_flags(snippets_vue: false)
-  end
+  let(:public_snippet) { create(:personal_snippet, :public, :repository) }
+  let(:content) { public_snippet.blobs.first.data.strip! }
 
   it 'Unauthenticated user should see public snippets' do
-    public_snippet = create(:personal_snippet, :public)
+    url = Gitlab::UrlBuilder.build(public_snippet)
 
     visit snippet_path(public_snippet)
     wait_for_requests
 
-    expect(page).to have_content(public_snippet.content)
-    expect(page).to have_css('.js-embed-btn', visible: false)
-    expect(page).to have_css('.js-share-btn', visible: false)
-    expect(page.find('.js-snippet-url-area')).to be_readonly
+    expect(page).to have_content(content)
+    click_button('Embed')
+    expect(page).to have_field('Embed', readonly: true, with: "<script src=\"#{url}.js\"></script>")
+    expect(page).to have_field('Share', readonly: true, with: url)
   end
 
   it 'Unauthenticated user should see raw public snippets' do
-    public_snippet = create(:personal_snippet, :public)
-
     visit raw_snippet_path(public_snippet)
 
-    expect(page).to have_content(public_snippet.content)
+    expect(page).to have_content(content)
   end
 end
diff --git a/spec/features/snippets/show_spec.rb b/spec/features/snippets/show_spec.rb
index 981ed12d540..2103d362f94 100644
--- a/spec/features/snippets/show_spec.rb
+++ b/spec/features/snippets/show_spec.rb
@@ -6,10 +6,6 @@ RSpec.describe 'Snippet', :js do
   let_it_be(:user) { create(:user) }
   let_it_be(:snippet) { create(:personal_snippet, :public, :repository, author: user) }
 
-  before do
-    stub_feature_flags(snippets_vue: false)
-  end
-
   it_behaves_like 'show and render proper snippet blob' do
     let(:anchor) { nil }
 
@@ -20,12 +16,8 @@ RSpec.describe 'Snippet', :js do
     end
   end
 
-  it_behaves_like 'showing user status' do
-    let(:file_path) { 'files/ruby/popen.rb' }
-    let(:user_with_status) { snippet.author }
-
-    subject { visit snippet_path(snippet) }
-  end
+  # it_behaves_like 'showing user status' do
+  # This will be handled in https://gitlab.com/gitlab-org/gitlab/-/issues/262394
 
   it_behaves_like 'does not show New Snippet button' do
     let(:file_path) { 'files/ruby/popen.rb' }
diff --git a/spec/features/snippets/user_deletes_snippet_spec.rb b/spec/features/snippets/user_deletes_snippet_spec.rb
index d7cfc67df13..e896f7eb25b 100644
--- a/spec/features/snippets/user_deletes_snippet_spec.rb
+++ b/spec/features/snippets/user_deletes_snippet_spec.rb
@@ -2,21 +2,23 @@
 
 require 'spec_helper'
 
-RSpec.describe 'User deletes snippet' do
+RSpec.describe 'User deletes snippet', :js do
   let(:user) { create(:user) }
   let(:content) { 'puts "test"' }
-  let(:snippet) { create(:personal_snippet, :public, content: content, author: user) }
+  let(:snippet) { create(:personal_snippet, :repository, :public, content: content, author: user) }
 
   before do
     sign_in(user)
 
-    stub_feature_flags(snippets_vue: false)
-
     visit snippet_path(snippet)
   end
 
   it 'deletes the snippet' do
-    first(:link, 'Delete').click
+    expect(page).to have_content(snippet.title)
+
+    click_button('Delete')
+    click_button('Delete snippet')
+    wait_for_requests
 
     expect(page).not_to have_content(snippet.title)
   end