Merge branch 'replace_spinach_wiki.feature' into 'master'

Replace 'project/wiki.feature' spinach test with an rspec analog

See merge request !13856

2 files changed, 0 insertions, 296 deletions

diff --git a/features/project/wiki.feature b/features/project/wiki.feature
deleted file mode 100644
index a04228de03b..00000000000
--- a/features/project/wiki.feature
+++ /dev/null
@@ -1,101 +0,0 @@
-Feature: Project Wiki
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-    Given I visit project wiki page
-
-  Scenario: Add new page
-    Given I create the Wiki Home page
-    Then I should see the newly created wiki page
-
-  Scenario: Add new page with errors
-    Given I create the Wiki Home page with no content
-    Then I should see a "Content can't be blank" error message
-    When I create the Wiki Home page
-    Then I should see the newly created wiki page
-
-  Scenario: Pressing Cancel while editing a brand new Wiki
-    Given I click on the Cancel button
-    Then I should be redirected back to the Edit Home Wiki page
-
-  Scenario: Edit existing page
-    Given I have an existing Wiki page
-    And I browse to that Wiki page
-    And I click on the Edit button
-    And I change the content
-    Then I should see the updated content
-
-  Scenario: Pressing Cancel while editing an existing Wiki page
-    Given I have an existing Wiki page
-    And I browse to that Wiki page
-    And I click on the Edit button
-    And I click on the Cancel button
-    Then I should be redirected back to that Wiki page
-
-  Scenario: View page history
-    Given I have an existing wiki page
-    And That page has two revisions
-    And I browse to that Wiki page
-    And I click the History button
-    Then I should see both revisions
-
-  Scenario: Destroy Wiki page
-    Given I have an existing wiki page
-    And I browse to that Wiki page
-    And I click on the Edit button
-    And I click on the "Delete this page" button
-    Then The page should be deleted
-
-  Scenario: View all pages
-    Given I have an existing wiki page
-    And I browse to that Wiki page
-    Then I should see the existing page in the pages list
-
-  Scenario: File exists in wiki repo
-    Given I have an existing Wiki page with images linked on page
-    And I browse to wiki page with images
-    And I click on existing image link
-    Then I should see the image from wiki repo
-
-  Scenario: Image in wiki repo shown on the page
-    Given I have an existing Wiki page with images linked on page
-    And I browse to wiki page with images
-    Then Image should be shown on the page
-
-  Scenario: File does not exist in wiki repo
-    Given I have an existing Wiki page with images linked on page
-    And I browse to wiki page with images
-    And I click on image link
-    Then I should see the new wiki page form
-
-  @javascript
-  Scenario: New Wiki page that has a path
-    Given I create a New page with paths
-    Then I should see non-escaped link in the pages list
-
-  @javascript
-  Scenario: Edit Wiki page that has a path
-    Given I create a New page with paths
-    And I edit the Wiki page with a path
-    Then I should see a non-escaped path
-    And I should see the Editing page
-    And I change the content
-    Then I should see the updated content
-
-  @javascript
-  Scenario: View the page history of a Wiki page that has a path
-    Given I create a New page with paths
-    And I view the page history of a Wiki page that has a path
-    Then I should see a non-escaped path
-    And I should see the page history
-
-  @javascript
-  Scenario: View an old page version of a Wiki page
-    Given I create a New page with paths
-    And I edit the Wiki page with a path
-    Then I should see a non-escaped path
-    And I should see the Editing page
-    And I change the content
-    Then I click on Page History
-    And I should see the page history
-    And I should see a link with a version ID
diff --git a/features/steps/project/wiki.rb b/features/steps/project/wiki.rb
deleted file mode 100644
index 855757e34b3..00000000000
--- a/features/steps/project/wiki.rb
+++ /dev/null
@@ -1,195 +0,0 @@
-class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedProject
-  include SharedNote
-  include SharedPaths
-
-  step 'I click on the Cancel button' do
-    page.within(:css, ".wiki-form .form-actions") do
-      click_on "Cancel"
-    end
-  end
-
-  step 'I should be redirected back to the Edit Home Wiki page' do
-    expect(current_path).to eq project_wiki_path(project, :home)
-  end
-
-  step 'I create the Wiki Home page' do
-    fill_in "wiki_content", with: '[link test](test)'
-    page.within '.wiki-form' do
-      click_on "Create page"
-    end
-  end
-
-  step 'I create the Wiki Home page with no content' do
-    fill_in "wiki_content", with: ''
-    page.within '.wiki-form' do
-      click_on "Create page"
-    end
-  end
-
-  step 'I should see the newly created wiki page' do
-    expect(page).to have_content "Home"
-    expect(page).to have_content "link test"
-
-    click_link "link test"
-    expect(page).to have_content "Create page"
-  end
-
-  step 'I have an existing Wiki page' do
-    wiki.create_page("existing", "content", :markdown, "first commit")
-    @page = wiki.find_page("existing")
-  end
-
-  step 'I browse to that Wiki page' do
-    visit project_wiki_path(project, @page)
-  end
-
-  step 'I click on the Edit button' do
-    click_on "Edit"
-  end
-
-  step 'I change the content' do
-    fill_in "Content", with: 'Updated Wiki Content'
-    click_on "Save changes"
-  end
-
-  step 'I should see the updated content' do
-    expect(page).to have_content "Updated Wiki Content"
-  end
-
-  step 'I should be redirected back to that Wiki page' do
-    expect(current_path).to eq project_wiki_path(project, @page)
-  end
-
-  step 'That page has two revisions' do
-    @page.update(content: "new content", message: "second commit")
-  end
-
-  step 'I click the History button' do
-    click_on 'Page history'
-  end
-
-  step 'I should see both revisions' do
-    expect(page).to have_content current_user.name
-    expect(page).to have_content "first commit"
-    expect(page).to have_content "second commit"
-  end
-
-  step 'I click on the "Delete this page" button' do
-    click_on "Delete"
-  end
-
-  step 'The page should be deleted' do
-    expect(page).to have_content "Page was successfully deleted"
-  end
-
-  step 'I should see the existing page in the pages list' do
-    expect(page).to have_content current_user.name
-    expect(find('.wiki-pages')).to have_content @page.title.capitalize
-  end
-
-  step 'I have an existing Wiki page with images linked on page' do
-    wiki.create_page("pictures", "Look at this [image](image.jpg)\n\n ![alt text](image.jpg)", :markdown, "first commit")
-    @wiki_page = wiki.find_page("pictures")
-  end
-
-  step 'I browse to wiki page with images' do
-    visit project_wiki_path(project, @wiki_page)
-  end
-
-  step 'I click on existing image link' do
-    file = Gollum::File.new(wiki.wiki)
-    Gollum::Wiki.any_instance.stub(:file).with("image.jpg", "master", true).and_return(file)
-    Gollum::File.any_instance.stub(:mime_type).and_return("image/jpeg")
-    expect(page).to have_link('image', href: "#{wiki.wiki_base_path}/image.jpg")
-    click_on "image"
-  end
-
-  step 'I should see the image from wiki repo' do
-    expect(current_path).to match('wikis/image.jpg')
-    expect(page).not_to have_xpath('/html') # Page should render the image which means there is no html involved
-    Gollum::Wiki.any_instance.unstub(:file)
-    Gollum::File.any_instance.unstub(:mime_type)
-  end
-
-  step 'Image should be shown on the page' do
-    expect(page).to have_xpath("//img[@data-src=\"image.jpg\"]")
-  end
-
-  step 'I click on image link' do
-    expect(page).to have_link('image', href: "#{wiki.wiki_base_path}/image.jpg")
-    click_on "image"
-  end
-
-  step 'I should see the new wiki page form' do
-    expect(current_path).to match('wikis/image.jpg')
-    expect(page).to have_content('New Wiki Page')
-    expect(page).to have_content('Create page')
-  end
-
-  step 'I create a New page with paths' do
-    click_on 'New page'
-    fill_in 'Page slug', with: 'one/two/three-test'
-    page.within '#modal-new-wiki' do
-      click_on 'Create page'
-    end
-    fill_in "wiki_content", with: 'wiki content'
-    page.within '.wiki-form' do
-      click_on "Create page"
-    end
-    expect(current_path).to include 'one/two/three-test'
-  end
-
-  step 'I should see non-escaped link in the pages list' do
-    expect(page).to have_xpath("//a[@href='/#{project.full_path}/wikis/one/two/three-test']")
-  end
-
-  step 'I edit the Wiki page with a path' do
-    expect(find('.wiki-pages')).to have_content('Three')
-    click_on 'Three'
-    expect(find('.nav-text')).to have_content('Three')
-    click_on 'Edit'
-  end
-
-  step 'I should see a non-escaped path' do
-    expect(current_path).to include 'one/two/three-test'
-  end
-
-  step 'I should see the Editing page' do
-    expect(page).to have_content('Edit Page')
-  end
-
-  step 'I view the page history of a Wiki page that has a path' do
-    click_on 'Three'
-    click_on 'Page history'
-  end
-
-  step 'I click on Page History' do
-    click_on 'Page history'
-  end
-
-  step 'I should see the page history' do
-    page.within(:css, ".nav-text") do
-      expect(page).to have_content('History')
-    end
-  end
-
-  step 'I search for Wiki content' do
-    fill_in "Search", with: "wiki_content"
-    click_button "Search"
-  end
-
-  step 'I should see a link with a version ID' do
-    find('a[href*="?version_id"]')
-  end
-
-  step 'I should see a "Content can\'t be blank" error message' do
-    expect(page).to have_content('The form contains the following error:')
-    expect(page).to have_content('Content can\'t be blank')
-  end
-
-  def wiki
-    @project_wiki = ProjectWiki.new(project, current_user)
-  end
-end