From c40e808352fc4a9c1959acb68c8e85657a2164a7 Mon Sep 17 00:00:00 2001 From: emgord Date: Wed, 30 Mar 2016 11:14:30 -0700 Subject: [PATCH] fixed cucumber test for admin merging articles --- features/merge_articles.feature | 4 ++-- features/step_definitions/web_steps.rb | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/features/merge_articles.feature b/features/merge_articles.feature index b2fe03b554..a4e697bd66 100644 --- a/features/merge_articles.feature +++ b/features/merge_articles.feature @@ -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" diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb index 3d2425be6b..3430a4aba6 100644 --- a/features/step_definitions/web_steps.rb +++ b/features/step_definitions/web_steps.rb @@ -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")) @@ -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