Replace 'snippets/snippets.feature' spinach with rspec

11 files changed, 57 insertions, 207 deletions

diff --git a/changelogs/unreleased/23036-replace-snippets-spinach.yml b/changelogs/unreleased/23036-replace-snippets-spinach.yml
new file mode 100644
index 00000000000..545805b1302
--- /dev/null
+++ b/changelogs/unreleased/23036-replace-snippets-spinach.yml
@@ -0,0 +1,4 @@
+---
+title: Replace 'snippets/snippets.feature' spinach with rspec
+merge_request: 12385
+author: Alexander Randa @randaalex
diff --git a/features/snippets/snippets.feature b/features/snippets/snippets.feature
deleted file mode 100644
index 1ad02780229..00000000000
--- a/features/snippets/snippets.feature
+++ /dev/null
@@ -1,40 +0,0 @@
-@snippets
-Feature: Snippets
-  Background:
-    Given I sign in as a user
-    And I have public "Personal snippet one" snippet
-    And I have private "Personal snippet private" snippet
-
-  @javascript
-  Scenario: I create new snippet
-    Given I visit new snippet page
-    And I submit new snippet "Personal snippet three"
-    Then I should see snippet "Personal snippet three"
-
-  Scenario: I update "Personal snippet one"
-    Given I visit snippet page "Personal snippet one"
-    And I click link "Edit"
-    And I submit new title "Personal snippet new title"
-    Then I should see "Personal snippet new title"
-
-  Scenario: Set "Personal snippet one" public
-    Given I visit snippet page "Personal snippet one"
-    And I click link "Edit"
-    And I uncheck "Private" checkbox
-    Then I should see "Personal snippet one" public
-
-  Scenario: I destroy "Personal snippet one"
-    Given I visit snippet page "Personal snippet one"
-    And I click link "Delete"
-    Then I should not see "Personal snippet one" in snippets
-
-  Scenario: I create new internal snippet
-    Given I logout directly
-    And I sign in as an admin
-    Then I visit new snippet page
-    And I submit new internal snippet
-    Then I visit snippet page "Internal personal snippet one"
-    And I logout directly
-    Then I sign in as a user
-    Given I visit new snippet page
-    Then I visit snippet page "Internal personal snippet one"
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index f0e751b820a..794631a2c4f 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -491,10 +491,6 @@ module SharedPaths
     visit explore_snippets_path
   end
 
-  step 'I visit new snippet page' do
-    visit new_snippet_path
-  end
-
   def root_ref
     @project.repository.root_ref
   end
diff --git a/features/steps/shared/snippet.rb b/features/steps/shared/snippet.rb
deleted file mode 100644
index bb596c1620a..00000000000
--- a/features/steps/shared/snippet.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-module SharedSnippet
-  include Spinach::DSL
-
-  step 'I have public "Personal snippet one" snippet' do
-    create(:personal_snippet,
-           title: "Personal snippet one",
-           content: "Test content",
-           file_name: "snippet.rb",
-           visibility_level: Snippet::PUBLIC,
-           author: current_user)
-  end
-
-  step 'I have private "Personal snippet private" snippet' do
-    create(:personal_snippet,
-           title: "Personal snippet private",
-           content: "Provate content",
-           file_name: "private_snippet.rb",
-           visibility_level: Snippet::PRIVATE,
-           author: current_user)
-  end
-  
-  step 'I have internal "Personal snippet internal" snippet' do
-    create(:personal_snippet,
-           title: "Personal snippet internal",
-           content: "Provate content",
-           file_name: "internal_snippet.rb",
-           visibility_level: Snippet::INTERNAL,
-           author: current_user)
-  end
-  
-  step 'I have a public many lined snippet' do
-    create(:personal_snippet,
-           title: 'Many lined snippet',
-           content: <<-END.gsub(/^\s+\|/, ''),
-             |line one
-             |line two
-             |line three
-             |line four
-             |line five
-             |line six
-             |line seven
-             |line eight
-             |line nine
-             |line ten
-             |line eleven
-             |line twelve
-             |line thirteen
-             |line fourteen
-           END
-           file_name: 'many_lined_snippet.rb',
-           visibility_level: Snippet::PUBLIC,
-           author: current_user)
-  end
-
-  step 'There is public "Personal snippet one" snippet' do
-    create(:personal_snippet,
-           title: "Personal snippet one",
-           content: "Test content",
-           file_name: "snippet.rb",
-           visibility_level: Snippet::PUBLIC,
-           author: create(:user))
-  end
-end
diff --git a/features/steps/snippets/snippets.rb b/features/steps/snippets/snippets.rb
deleted file mode 100644
index a4fc77746ee..00000000000
--- a/features/steps/snippets/snippets.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-class Spinach::Features::Snippets < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include SharedProject
-  include SharedSnippet
-  include WaitForRequests
-
-  step 'I click link "Personal snippet one"' do
-    click_link "Personal snippet one"
-  end
-
-  step 'I should not see "Personal snippet one" in snippets' do
-    expect(page).not_to have_content "Personal snippet one"
-  end
-
-  step 'I click link "Edit"' do
-    page.within ".detail-page-header" do
-      first(:link, "Edit").click
-    end
-  end
-
-  step 'I click link "Delete"' do
-    first(:link, "Delete").click
-  end
-
-  step 'I submit new snippet "Personal snippet three"' do
-    fill_in "personal_snippet_title", with: "Personal snippet three"
-    fill_in "personal_snippet_file_name", with: "my_snippet.rb"
-    page.within('.file-editor') do
-      find('.ace_editor').native.send_keys 'Content of snippet three'
-    end
-    click_button "Create snippet"
-    wait_for_requests
-  end
-
-  step 'I submit new internal snippet' do
-    fill_in "personal_snippet_title", with: "Internal personal snippet one"
-    fill_in "personal_snippet_file_name", with: "my_snippet.rb"
-    choose 'personal_snippet_visibility_level_10'
-
-    page.within('.file-editor') do
-      find(:xpath, "//input[@id='personal_snippet_content']").set 'Content of internal snippet'
-    end
-
-    click_button "Create snippet"
-  end
-
-  step 'I should see snippet "Personal snippet three"' do
-    expect(page).to have_content "Personal snippet three"
-    expect(page).to have_content "Content of snippet three"
-  end
-
-  step 'I submit new title "Personal snippet new title"' do
-    fill_in "personal_snippet_title", with: "Personal snippet new title"
-    click_button "Save"
-  end
-
-  step 'I should see "Personal snippet new title"' do
-    expect(page).to have_content "Personal snippet new title"
-  end
-
-  step 'I uncheck "Private" checkbox' do
-    choose "Internal"
-    click_button "Save"
-  end
-
-  step 'I should see "Personal snippet one" public' do
-    expect(page).to have_no_xpath("//i[@class='public-snippet']")
-  end
-
-  step 'I visit snippet page "Personal snippet one"' do
-    visit snippet_path(snippet)
-  end
-
-  step 'I visit snippet page "Internal personal snippet one"' do
-    visit snippet_path(internal_snippet)
-  end
-
-  def snippet
-    @snippet ||= PersonalSnippet.find_by!(title: "Personal snippet one")
-  end
-
-  def internal_snippet
-    @snippet ||= PersonalSnippet.find_by!(title: "Internal personal snippet one")
-  end
-end
diff --git a/spec/factories/personal_snippets.rb b/spec/factories/personal_snippets.rb
deleted file mode 100644
index 0f13b2c1020..00000000000
--- a/spec/factories/personal_snippets.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-FactoryGirl.define do
-  factory :personal_snippet, parent: :snippet, class: :PersonalSnippet do
-  end
-end
diff --git a/spec/factories/project_snippets.rb b/spec/factories/project_snippets.rb
deleted file mode 100644
index e0fe1b36fd3..00000000000
--- a/spec/factories/project_snippets.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-FactoryGirl.define do
-  factory :project_snippet, parent: :snippet, class: :ProjectSnippet do
-    project factory: :empty_project
-  end
-end
diff --git a/spec/factories/snippets.rb b/spec/factories/snippets.rb
index 388f662e6e5..f6ce99d50f9 100644
--- a/spec/factories/snippets.rb
+++ b/spec/factories/snippets.rb
@@ -18,4 +18,11 @@ FactoryGirl.define do
       visibility_level Snippet::PRIVATE
     end
   end
+
+  factory :project_snippet, parent: :snippet, class: :ProjectSnippet do
+    project factory: :empty_project
+  end
+
+  factory :personal_snippet, parent: :snippet, class: :PersonalSnippet do
+  end
 end
diff --git a/spec/features/snippets/create_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb
index ac5c14ed427..57dec14b480 100644
--- a/spec/features/snippets/create_snippet_spec.rb
+++ b/spec/features/snippets/user_creates_snippet_spec.rb
@@ -1,10 +1,12 @@
 require 'rails_helper'
 
-feature 'Create Snippet', :js, feature: true do
+feature 'User creates snippet', :js, feature: true do
   include DropzoneHelper
 
+  let(:user) { create(:user) }
+
   before do
-    gitlab_sign_in :user
+    sign_in(user)
     visit new_snippet_path
   end
 
diff --git a/spec/features/snippets/user_deletes_snippet_spec.rb b/spec/features/snippets/user_deletes_snippet_spec.rb
new file mode 100644
index 00000000000..162c2c9e730
--- /dev/null
+++ b/spec/features/snippets/user_deletes_snippet_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+feature 'User deletes snippet', feature: true do
+  let(:user) { create(:user) }
+  let(:content) { 'puts "test"' }
+  let(:snippet) { create(:personal_snippet, :public, content: content, author: user) }
+
+  before do
+    sign_in(user)
+
+    visit snippet_path(snippet)
+  end
+
+  it 'deletes the snippet' do
+    first(:link, 'Delete').click
+
+    expect(page).not_to have_content(snippet.title)
+  end
+end
diff --git a/spec/features/snippets/edit_snippet_spec.rb b/spec/features/snippets/user_edits_snippet_spec.rb
index 860e1b156d6..cff64423873 100644
--- a/spec/features/snippets/edit_snippet_spec.rb
+++ b/spec/features/snippets/user_edits_snippet_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-feature 'Edit Snippet', :js, feature: true do
+feature 'User edits snippet', :js, feature: true do
   include DropzoneHelper
 
   let(:file_name) { 'test.rb' }
@@ -10,7 +10,7 @@ feature 'Edit Snippet', :js, feature: true do
   let(:snippet) { create(:personal_snippet, :public, file_name: file_name, content: content, author: user) }
 
   before do
-    gitlab_sign_in(user)
+    sign_in(user)
 
     visit edit_snippet_path(snippet)
     wait_for_requests
@@ -27,7 +27,7 @@ feature 'Edit Snippet', :js, feature: true do
 
   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')
+    expect(page.find_field('personal_snippet_description').value).to have_content('banana_sample')
 
     click_button('Save changes')
     wait_for_requests
@@ -35,4 +35,24 @@ feature 'Edit 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.id}/\h{32}/banana_sample\.gif\z})
   end
+
+  it 'updates the snippet to make it internal' do
+    choose 'Internal'
+
+    click_button 'Save changes'
+    wait_for_requests
+
+    expect(page).to have_no_xpath("//i[@class='fa fa-lock']")
+    expect(page).to have_xpath("//i[@class='fa fa-shield']")
+  end
+
+  it 'updates the snippet to make it public' do
+    choose 'Public'
+
+    click_button 'Save changes'
+    wait_for_requests
+
+    expect(page).to have_no_xpath("//i[@class='fa fa-lock']")
+    expect(page).to have_xpath("//i[@class='fa fa-globe']")
+  end
 end