diff options
author | Jarka Kadlecova <jarka@gitlab.com> | 2017-05-29 10:54:35 +0300 |
---|---|---|
committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-06-07 08:52:41 +0300 |
commit | 2e311d9d1aac58bbd9c7d6c97c7cbcccf2715347 (patch) | |
tree | 04555ee940d5488ef6d44c5ad3afa0688cd6c1c5 /spec/features/snippets | |
parent | 4464c22d6d23d893494682d309aec3fb31c11ae3 (diff) |
Support uploads for newly created personal snippets
Diffstat (limited to 'spec/features/snippets')
-rw-r--r-- | spec/features/snippets/create_snippet_spec.rb | 22 | ||||
-rw-r--r-- | spec/features/snippets/edit_snippet_spec.rb | 6 |
2 files changed, 25 insertions, 3 deletions
diff --git a/spec/features/snippets/create_snippet_spec.rb b/spec/features/snippets/create_snippet_spec.rb index f006057669b..ddd31ede064 100644 --- a/spec/features/snippets/create_snippet_spec.rb +++ b/spec/features/snippets/create_snippet_spec.rb @@ -30,6 +30,22 @@ feature 'Create Snippet', :js, feature: true do expect(page).to have_content('Hello World!') end + scenario 'previews a snippet with file' do + fill_in 'personal_snippet_description', with: 'My Snippet' + dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif') + find('.js-md-preview-button').click + + page.within('#new_personal_snippet .md-preview') do + expect(page).to have_content('My Snippet') + + link = find('a.no-attachment-icon img[alt="banana_sample"]')['src'] + expect(link).to match(%r{/uploads/temp/\h{32}/banana_sample\.gif\z}) + + visit(link) + expect(page.status_code).to eq(200) + end + end + scenario 'uploads a file when dragging into textarea' do fill_form @@ -42,6 +58,9 @@ feature 'Create Snippet', :js, feature: true do link = find('a.no-attachment-icon img[alt="banana_sample"]')['src'] expect(link).to match(%r{/uploads/personal_snippet/#{Snippet.last.id}/\h{32}/banana_sample\.gif\z}) + + visit(link) + expect(page.status_code).to eq(200) end scenario 'validation fails for the first time' do @@ -64,6 +83,9 @@ feature 'Create Snippet', :js, feature: true do expect(page).to have_content('Hello World!') link = find('a.no-attachment-icon img[alt="banana_sample"]')['src'] expect(link).to match(%r{/uploads/personal_snippet/#{Snippet.last.id}/\h{32}/banana_sample\.gif\z}) + + visit(link) + expect(page.status_code).to eq(200) end scenario 'Authenticated user creates a snippet with + in filename' do diff --git a/spec/features/snippets/edit_snippet_spec.rb b/spec/features/snippets/edit_snippet_spec.rb index ee04792ef73..89ae593db88 100644 --- a/spec/features/snippets/edit_snippet_spec.rb +++ b/spec/features/snippets/edit_snippet_spec.rb @@ -13,14 +13,14 @@ feature 'Edit Snippet', :js, feature: true do login_as(user) visit edit_snippet_path(snippet) - wait_for_ajax + wait_for_requests end it 'updates the snippet' do fill_in 'personal_snippet_title', with: 'New Snippet Title' click_button('Save changes') - wait_for_ajax + wait_for_requests expect(page).to have_content('New Snippet Title') end @@ -30,7 +30,7 @@ feature 'Edit Snippet', :js, feature: true do expect(page.find_field("personal_snippet_description").value).to have_content('banana_sample') click_button('Save changes') - wait_for_ajax + wait_for_requests link = find('a.no-attachment-icon img[alt="banana_sample"]')['src'] expect(link).to match(%r{/uploads/personal_snippet/#{snippet.id}/\h{32}/banana_sample\.gif\z}) |