Skip to content

Commit

Permalink
fixed cucumber test for admin merging articles
Browse files Browse the repository at this point in the history
  • Loading branch information
emgord committed Mar 30, 2016
1 parent faf1d35 commit c40e808
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions features/merge_articles.feature
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ Feature: Merge Articles
When I follow "Edit"
Then I should be on the edit articles page
And I should see "Merge Articles"
When I fill in "merge_with" with "3"
When I fill in "merge_with_merge_id" with "4"
And I press "Merge"
Then I should be on the manage articles page
And I should not see "default_allow_pings"
And I should see "Cats"
And I should not see "Dogs"
When I follow "Show"
Then I should see "I love cats I love dogs"
3 changes: 2 additions & 1 deletion features/step_definitions/web_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

require 'uri'
require 'cgi'
require 'pry'
require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))

Expand Down Expand Up @@ -307,7 +308,7 @@ def with_scope(locator)
article.user_id = 2
article.published_at = "March 29, 2016 07:07 PM GMT+0000 (UTC)"
article.title = title
article.body_and_extended= "I love" + title.downcase
article.body_and_extended= "I love " + title.downcase
article.save
end
end

0 comments on commit c40e808

Please sign in to comment.