fixed scenarios marked @wip

hammernight · Jul 1, 2012 · b41c7ef · b41c7ef
1 parent f291c4a
commit b41c7ef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/features/etsy_search.feature b/features/etsy_search.feature
@@ -9,16 +9,14 @@ Feature: Etsy Search Functionality
     When I search for "hat"
     Then I should see "handmade" search results for "hat"
 
-  @wip
   Scenario Outline: : basic search for an item
     Given I am searching on Etsy
     When I search for "<item>" of a specific "<item_type>"
     Then I should see "<item_type>" search results for "<item>"
 
   Scenarios: Search for item and item type
-    | item   | item_type |
-    | hat    | handmade  |
-    | shirt  | vintage   |
-    | brush  | supplies  |
-    | george | people    |
-    | place  | shops     |
+    | item          | item_type |
+    | hat           | Handmade  |
+    | shirt         | Vintage   |
+    | brush         | Supplies  |
+    | bottle opener | All Items |
diff --git a/features/step_definitions/etsy_step_definitions.rb b/features/step_definitions/etsy_step_definitions.rb
@@ -51,13 +51,15 @@
 end
 
 When /^I search for "([^"]*)" of a specific "([^"]*)"$/ do |search_item, type|
-  pending
-  @site.etsy_header.search_type(type).click
+  @site.etsy_header.search_drop_down.when_present.click
+  @site.etsy_header.search_type(type).wait_until_present
+  @site.etsy_header.search_type(type).when_present.click
   @site.search_for(search_item)
 end
 
 Then /^I should see "([^"]*)" search results for "([^"]*)"$/ do |search_category, search_item|
-  @site.browser.title.should include(search_category)
+  @site.search_results_page.search_filter_radio(search_category).checked?.should be_true
+  @site.browser.title.should include(search_item)
   @site.search_results_page.search_results_message.text.should include(search_item)
 end
 

diff --git a/lib/sites/etsy/pages/search_results_page.rb b/lib/sites/etsy/pages/search_results_page.rb
@@ -7,7 +7,7 @@ class SearchResultsPage < ::Taza::Page
 
     element(:first_result) { browser.ul(:class => 'listings').li(:index => 1) }
     element(:first_result_link) { browser.ul(:class => 'listings').li(:index => 1).link(:class => 'listing-thumb') }
-    element(:search_results_message) { browser.h1(:class => 'summary') }
+    element(:search_results_message) { browser.h1(:class => 'summary').li }
 
     element(:side_navigation) { browser.div(:class => "section category-nav") }
     element(:search_filter) { |filter_name| side_navigation.span(:class => "text", :text => filter_name) }