Permalink
Browse files

Done with HW3

  • Loading branch information...
1 parent cab959e commit ae08fbb12de778fcccd32200da452330dd4d83d7 saasbook committed Mar 27, 2012
Showing with 20 additions and 4 deletions.
  1. +2 −0 features/sort_movie_list.feature
  2. +18 −4 features/step_definitions/movie_steps.rb
@@ -33,5 +33,7 @@ Scenario: sort movies in increasing order of release date
Given I check the following ratings: G, PG, PG-13, NC-17, R
And I press "ratings_submit"
And I follow "release_date_header"
+ # Then show me the page
Then I should see movies sorted by "release_date"
+ # Then I should see "1981-06-12 00:00:00 UTC" before "2000-06-21 00:00:00 UTC"
@@ -15,9 +15,17 @@
Then /I should see "(.*)" before "(.*)"/ do |e1, e2|
# ensure that that e1 occurs before e2.
# page.content is the entire content of the page as a string.
- # puts e1,e2
+ # puts e1,e2,"This is one pair\n"
# puts page.body
- page.body.scan(Regexp.new("#{e1}.*#{e2}", Regexp::MULTILINE)).size > 0
+ ee1 = Regexp.escape(e1)
+ ee2 = Regexp.escape(e2)
+ result = page.body.scan(Regexp.new("#{ee1}.*#{ee2}", Regexp::MULTILINE)).size
+ # puts result
+ if (result > 0)
+ assert true,'Matches found'
+ else
+ assert false, 'No Match found'
+ end
end
# Make it easier to express checking or unchecking several boxes at once
@@ -41,8 +49,14 @@
Then /^I should see movies sorted by "(.*)"$/ do |sortable|
movie_list = Movie.order(sortable)
- movie_list[0..movie_list.length-2].zip(movie_list[1..movie_list.length-1]).each do |x, y|
- step %Q{I should see "#{x[:title]}" before "#{y[:title]}"}
+ if sortable == "title"
+ movie_list[0..movie_list.length-2].zip(movie_list[1..movie_list.length-1]).each do |x, y|
+ step %Q{I should see "#{x[:title]}" before "#{y[:title]}"}
+ end
+ elsif sortable == "release_date"
+ movie_list[0..movie_list.length-2].zip(movie_list[1..movie_list.length-1]).each do |x, y|
+ step %Q{I should see "#{x[:release_date]}" before "#{y[:release_date]}"}
+ end
end
end

0 comments on commit ae08fbb

Please sign in to comment.