diff options
Diffstat (limited to 'spec/features/snippets')
-rw-r--r-- | spec/features/snippets/spam_snippets_spec.rb | 19 | ||||
-rw-r--r-- | spec/features/snippets/user_creates_snippet_spec.rb | 197 | ||||
-rw-r--r-- | spec/features/snippets/user_edits_snippet_spec.rb | 131 |
3 files changed, 201 insertions, 146 deletions
diff --git a/spec/features/snippets/spam_snippets_spec.rb b/spec/features/snippets/spam_snippets_spec.rb index e6a9467a3d7..1483ba4bf8f 100644 --- a/spec/features/snippets/spam_snippets_spec.rb +++ b/spec/features/snippets/spam_snippets_spec.rb @@ -11,8 +11,6 @@ RSpec.shared_examples_for 'snippet editor' do before do stub_feature_flags(allow_possible_spam: false) - stub_feature_flags(snippets_vue: false) - stub_feature_flags(snippets_edit_vue: false) stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') Gitlab::CurrentSettings.update!( @@ -125,5 +123,20 @@ end RSpec.describe 'User creates snippet', :js do let_it_be(:user) { create(:user) } - it_behaves_like "snippet editor" + context 'Vue application' do + before do + stub_feature_flags(snippets_edit_vue: false) + end + + it_behaves_like "snippet editor" + end + + context 'non-Vue application' do + before do + stub_feature_flags(snippets_vue: false) + stub_feature_flags(snippets_edit_vue: false) + end + + it_behaves_like "snippet editor" + end end diff --git a/spec/features/snippets/user_creates_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb index f4c6536d6d3..eabca028b8c 100644 --- a/spec/features/snippets/user_creates_snippet_spec.rb +++ b/spec/features/snippets/user_creates_snippet_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe 'User creates snippet', :js do include DropzoneHelper + include Spec::Support::Helpers::Features::SnippetSpecHelpers let_it_be(:user) { create(:user) } @@ -12,149 +13,163 @@ RSpec.describe 'User creates snippet', :js do let(:md_description) { 'My Snippet **Description**' } let(:description) { 'My Snippet Description' } let(:created_snippet) { Snippet.last } - - before do - stub_feature_flags(snippets_vue: false) - stub_feature_flags(snippets_edit_vue: false) - sign_in(user) - end + let(:snippet_title_field) { 'personal_snippet_title' } def description_field find('.js-description-input').find('input,textarea') end - def fill_form - fill_in 'personal_snippet_title', with: title - - # Click placeholder first to expand full description field - description_field.click - fill_in 'personal_snippet_description', with: md_description - - page.within('.file-editor') do - el = find('.inputarea') - el.send_keys file_content + shared_examples 'snippet creation' do + def fill_form + snippet_fill_in_form(title: title, content: file_content, description: md_description) end - end - - it 'Authenticated user creates a snippet' do - visit new_snippet_path - fill_form + it 'Authenticated user creates a snippet' do + fill_form - click_button('Create snippet') - wait_for_requests + click_button('Create snippet') + wait_for_requests - expect(page).to have_content(title) - page.within('.snippet-header .description') do - expect(page).to have_content(description) - expect(page).to have_selector('strong') + expect(page).to have_content(title) + page.within(snippet_description_view_selector) do + expect(page).to have_content(description) + expect(page).to have_selector('strong') + end + expect(page).to have_content(file_content) end - expect(page).to have_content(file_content) - end - it 'previews a snippet with file' do - visit new_snippet_path + it 'uploads a file when dragging into textarea' do + fill_form + dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif') - # Click placeholder first to expand full description field - description_field.click - fill_in 'personal_snippet_description', with: 'My Snippet' - dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif') - find('.js-md-preview-button').click + expect(snippet_description_value).to have_content('banana_sample') - page.within('#new_personal_snippet .md-preview-holder') do - expect(page).to have_content('My Snippet') + click_button('Create snippet') + wait_for_requests link = find('a.no-attachment-icon img.js-lazy-loaded[alt="banana_sample"]')['src'] - expect(link).to match(%r{/uploads/-/system/user/#{user.id}/\h{32}/banana_sample\.gif\z}) + expect(link).to match(%r{/uploads/-/system/personal_snippet/#{Snippet.last.id}/\h{32}/banana_sample\.gif\z}) - # Adds a cache buster for checking if the image exists as Selenium is now handling the cached requests - # not anymore as requests when they come straight from memory cache. reqs = inspect_requests { visit("#{link}?ran=#{SecureRandom.base64(20)}") } expect(reqs.first.status_code).to eq(200) end - end - it 'uploads a file when dragging into textarea' do - visit new_snippet_path + context 'when the git operation fails' do + let(:error) { 'Error creating the snippet' } - fill_form + before do + allow_next_instance_of(Snippets::CreateService) do |instance| + allow(instance).to receive(:create_commit).and_raise(StandardError, error) + end - dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif') + fill_form + click_button('Create snippet') + wait_for_requests + end + + it 'renders the new page and displays the error' do + expect(page).to have_content(error) + expect(page).to have_content('New Snippet') - expect(page.find_field("personal_snippet_description").value).to have_content('banana_sample') + action = find('form.snippet-form')['action'] + expect(action).to include("/snippets") + end + end - click_button('Create snippet') - wait_for_requests + context 'when snippets default visibility level is restricted' do + before do + stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PRIVATE], + default_snippet_visibility: Gitlab::VisibilityLevel::PRIVATE) + end - link = find('a.no-attachment-icon img.js-lazy-loaded[alt="banana_sample"]')['src'] - expect(link).to match(%r{/uploads/-/system/personal_snippet/#{Snippet.last.id}/\h{32}/banana_sample\.gif\z}) + it 'creates a snippet using the lowest available visibility level as default' do + visit new_snippet_path - reqs = inspect_requests { visit("#{link}?ran=#{SecureRandom.base64(20)}") } - expect(reqs.first.status_code).to eq(200) - end + fill_form - context 'when the git operation fails' do - let(:error) { 'Error creating the snippet' } + click_button('Create snippet') + wait_for_requests - before do - allow_next_instance_of(Snippets::CreateService) do |instance| - allow(instance).to receive(:create_commit).and_raise(StandardError, error) + expect(find('.blob-content')).to have_content(file_content) + expect(Snippet.last.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL) end + end - visit new_snippet_path + it_behaves_like 'personal snippet with references' do + let(:container) { snippet_description_view_selector } + let(:md_description) { references } - fill_form + subject do + fill_form + click_button('Create snippet') - click_button('Create snippet') - wait_for_requests + wait_for_requests + end end + end + + context 'Vue application' do + let(:snippet_description_field) { 'snippet-description' } + let(:snippet_description_view_selector) { '.snippet-header .snippet-description' } - it 'renders the new page and displays the error' do - expect(page).to have_content(error) - expect(page).to have_content('New Snippet') + before do + sign_in(user) - action = find('form.snippet-form')['action'] - expect(action).to match(%r{/snippets\z}) + visit new_snippet_path end - end - it 'validation fails for the first time' do - visit new_snippet_path + it_behaves_like 'snippet creation' - fill_in 'personal_snippet_title', with: title - click_button('Create snippet') + it 'validation fails for the first time' do + fill_in snippet_title_field, with: title - expect(page).to have_selector('#error_explanation') + expect(page).not_to have_button('Create snippet') + + snippet_fill_in_form(title: title, content: file_content) + expect(page).to have_button('Create snippet') + end end - context 'when snippets default visibility level is restricted' do + context 'non-Vue application' do + let(:snippet_description_field) { 'personal_snippet_description' } + let(:snippet_description_view_selector) { '.snippet-header .description' } + before do - stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PRIVATE], - default_snippet_visibility: Gitlab::VisibilityLevel::PRIVATE) - end + stub_feature_flags(snippets_vue: false) + stub_feature_flags(snippets_edit_vue: false) + + sign_in(user) - it 'creates a snippet using the lowest available visibility level as default' do visit new_snippet_path + end - fill_form + it_behaves_like 'snippet creation' + it 'validation fails for the first time' do + fill_in snippet_title_field, with: title click_button('Create snippet') - wait_for_requests - expect(created_snippet.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL) + expect(page).to have_selector('#error_explanation') end - end - it_behaves_like 'personal snippet with references' do - let(:container) { '.snippet-header .description' } - let(:md_description) { references } + it 'previews a snippet with file' do + # Click placeholder first to expand full description field + description_field.click + fill_in snippet_description_field, with: 'My Snippet' + dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif') + find('.js-md-preview-button').click - subject do - visit new_snippet_path - fill_form - click_button('Create snippet') + page.within('.md-preview-holder') do + expect(page).to have_content('My Snippet') - wait_for_requests + link = find('a.no-attachment-icon img.js-lazy-loaded[alt="banana_sample"]')['src'] + expect(link).to match(%r{/uploads/-/system/user/#{user.id}/\h{32}/banana_sample\.gif\z}) + + # Adds a cache buster for checking if the image exists as Selenium is now handling the cached requests + # not anymore as requests when they come straight from memory cache. + reqs = inspect_requests { visit("#{link}?ran=#{SecureRandom.base64(20)}") } + expect(reqs.first.status_code).to eq(200) + end end end end diff --git a/spec/features/snippets/user_edits_snippet_spec.rb b/spec/features/snippets/user_edits_snippet_spec.rb index 5773904dedf..9a83eb58b63 100644 --- a/spec/features/snippets/user_edits_snippet_spec.rb +++ b/spec/features/snippets/user_edits_snippet_spec.rb @@ -4,87 +4,114 @@ require 'spec_helper' RSpec.describe 'User edits snippet', :js do include DropzoneHelper + include Spec::Support::Helpers::Features::SnippetSpecHelpers let_it_be(:file_name) { 'test.rb' } let_it_be(:content) { 'puts "test"' } 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) } - before do - stub_feature_flags(snippets_vue: false) - stub_feature_flags(snippets_edit_vue: false) + let(:snippet_title_field) { 'personal_snippet_title' } - sign_in(user) + shared_examples 'snippet editing' do + it 'displays the snippet blob path and content' do + blob = snippet.blobs.first - visit edit_snippet_path(snippet) - wait_for_all_requests - end + aggregate_failures do + expect(snippet_get_first_blob_path).to eq blob.path + expect(snippet_get_first_blob_value).to have_content(blob.data.strip) + end + end - it 'displays the snippet blob path and content' do - blob = snippet.blobs.first + it 'updates the snippet' do + fill_in snippet_title_field, with: 'New Snippet Title' - aggregate_failures do - expect(page.find_field('personal_snippet_file_name').value).to eq blob.path - expect(page.find('.file-content')).to have_content(blob.data.strip) - expect(page.find('.snippet-file-content', visible: false).value).to eq blob.data + click_button('Save changes') + wait_for_requests + + expect(page).to have_content('New Snippet Title') end - end - it 'updates the snippet' do - fill_in 'personal_snippet_title', with: 'New Snippet Title' + it 'updates the snippet with files attached' do + dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif') + expect(snippet_description_value).to have_content('banana_sample') - click_button('Save changes') - wait_for_requests + click_button('Save changes') + wait_for_requests - expect(page).to have_content('New Snippet Title') - end + link = find('a.no-attachment-icon img:not(.lazy)[alt="banana_sample"]')['src'] + expect(link).to match(%r{/uploads/-/system/personal_snippet/#{snippet.id}/\h{32}/banana_sample\.gif\z}) + end - it 'updates the snippet with files attached' do - dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif') - expect(page.find_field('personal_snippet_description').value).to have_content('banana_sample') + it 'updates the snippet to make it internal' do + choose 'Internal' - click_button('Save changes') - wait_for_requests + click_button 'Save changes' + wait_for_requests - link = find('a.no-attachment-icon img:not(.lazy)[alt="banana_sample"]')['src'] - expect(link).to match(%r{/uploads/-/system/personal_snippet/#{snippet.id}/\h{32}/banana_sample\.gif\z}) - end + expect(page).to have_no_selector('[data-testid="lock-icon"]') + expect(page).to have_selector('[data-testid="shield-icon"]') + end - it 'updates the snippet to make it internal' do - choose 'Internal' + it 'updates the snippet to make it public' do + choose 'Public' - click_button 'Save changes' - wait_for_requests + click_button 'Save changes' + wait_for_requests - expect(page).to have_no_selector('[data-testid="lock-icon"]') - expect(page).to have_selector('[data-testid="shield-icon"]') - end + expect(page).to have_no_selector('[data-testid="lock-icon"]') + expect(page).to have_selector('[data-testid="earth-icon"]') + end - it 'updates the snippet to make it public' do - choose 'Public' + context 'when the git operation fails' do + before do + allow_next_instance_of(Snippets::UpdateService) do |instance| + allow(instance).to receive(:create_commit).and_raise(StandardError, 'Error Message') + end - click_button 'Save changes' - wait_for_requests + fill_in snippet_title_field, with: 'New Snippet Title' + fill_in snippet_blob_path_field, with: 'new_file_name', match: :first - expect(page).to have_no_selector('[data-testid="lock-icon"]') - expect(page).to have_selector('[data-testid="earth-icon"]') - end + click_button('Save changes') + end - context 'when the git operation fails' do - before do - allow_next_instance_of(Snippets::UpdateService) do |instance| - allow(instance).to receive(:create_commit).and_raise(StandardError, 'Error Message') + it 'renders edit page and displays the error' do + expect(page.find('.flash-container')).to have_content('Error updating the snippet - Error Message') + expect(page).to have_content('Edit Snippet') end + end + end - fill_in 'personal_snippet_title', with: 'New Snippet Title' - fill_in 'personal_snippet_file_name', with: 'new_file_name' + context 'Vue application' do + it_behaves_like 'snippet editing' do + let(:snippet_blob_path_field) { 'snippet_file_name' } + let(:snippet_blob_content_selector) { '.file-content' } + let(:snippet_description_field) { 'snippet-description' } - click_button('Save changes') + before do + sign_in(user) + + visit edit_snippet_path(snippet) + wait_for_all_requests + end end + end + + context 'non-Vue application' do + it_behaves_like 'snippet editing' do + let(:snippet_blob_path_field) { 'personal_snippet_file_name' } + let(:snippet_blob_content_selector) { '.file-content' } + let(:snippet_description_field) { 'personal_snippet_description' } - it 'renders edit page and displays the error' do - expect(page.find('.flash-container span').text).to eq('Error updating the snippet - Error Message') - expect(page).to have_content('Edit Snippet') + before do + stub_feature_flags(snippets_vue: false) + stub_feature_flags(snippets_edit_vue: false) + + sign_in(user) + + visit edit_snippet_path(snippet) + wait_for_all_requests + end end end end |