nofxx-watircuke 0.2.3 → 0.3.0

data/README

@@ -1,4 +1,4 @@
-= Watircuke 
+= Watircuke
 
 
 == INSTALL
@@ -14,12 +14,12 @@ Once installed just run "cucumber features" in Safari, Firefox, Watir (see featu
 
 == Rails
 
-Supposing your webrat features are on features/plain, Watir on features/watir and 
-you remove step_definitions/webrat_steps.rb (don't worry, steps will be included), 
+Supposing your webrat features are on features/plain, Watir on features/watir and
+you remove step_definitions/webrat_steps.rb (don't worry, steps will be included),
 you can run `cucumber` for plain webrat and `cucumber -p watir` for some Watir =D
 
 cucumber.yml
-    
+
     default: -r features/support/env.rb -r features/support/webrat.rb -r features/step_definitions features/plain
     watir:   -r features/support/env.rb -r features/support/watir.rb -r features/step_definitions features/watir
 
@@ -56,9 +56,8 @@ support/env.rb
     require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
     Cucumber::Rails.use_transactional_fixtures
     Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling
-        
-== TODO
 
-Rewrite the watir steps to resemble webrat's ones.
 
-**cukewatir maximizes the Gherkin speak and minimizes the Watir code.    
+== ABOUT
+
+**cukewatir maximizes the Gherkin speak and minimizes the Watir code.

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/cucumber.yml

@@ -0,0 +1 @@
+default: -r features/support/env.rb -r features/support/paths.rb features

data/features/ajax.feature

@@ -0,0 +1,8 @@
+Feature: Github
+
+  Scenario: ajaxy test
+    Given I am on the watircuke page
+    And I click "download_button"
+    And I wait until "facebox"
+    And I wait until "archives"
+    Then I should see "Download richdownie/watircuke at master "

data/features/sample.feature

@@ -1,10 +1,11 @@
 Feature: Github
-  
+
   Scenario: search for cucumber at github
-    Given I am on the watircuke page
-    Then I verify the page contains the text "richdownie"
-    And I fill in the text field "q" with "cucumber"
-    And I click the "Search" button
-    And I select "Code" from the select list "type_value"
-    And I click the "aslakhellesoy / cucumber" link
-    Then I verify the page contains the text "BDD that talks to domain experts first and code second"
+    Given I am on the cucumber page
+    Then I should see "BDD that talks to domain experts first and code second"
+    When I fill in "q" with "watircuke"
+    And I press "Search"
+    And I select "Code" from "type_value"
+    Then I should see "Repositories"
+    When I follow "richdownie / watircuke"
+    Then I should see "H30 (watir, safariwatir, firewatir)"

data/features/support/env.rb

@@ -1,39 +1,15 @@
-require 'test/unit/assertions'
-include Test::Unit::Assertions
 require 'spec'
+#require 'cucumber/rails/rspec'
+require 'webrat/core/matchers'
 
-if ENV['FIREWATIR']
-  require 'firewatir'
-  Browser = FireWatir::Firefox
-else
-  case RUBY_PLATFORM
-  when /darwin|i686-linux/
-    require 'firewatir'
-    Browser = FireWatir::Firefox
-    # require 'safariwatir'
-    # Browser = Watir::Safari
-  when /win32|mingw/
-    require 'watir'
-    Browser = Watir::IE
-  when /java/
-    require 'celerity'
-    Browser = Celerity::Browser
-  else
-    raise "This platform is not supported (#{PLATFORM})"
-  end
-end
-
-
- # "before all"
- browser = Browser.new
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/watircuke')
 
- Before do
-   @browser = browser
-   @environment = "http://github.com/"
-   sleep 3
- end
+Before do
+  @environment = "http://github.com/"
+#  sleep 1
+end
 
- # "after all"
- at_exit do
-   # @browser.close
- end
+# "after all"
+at_exit do
+ # @browser.close
+end

data/features/support/paths.rb

@@ -1,15 +1,18 @@
 module NavigationHelpers
   def path_to(page_name)
     case page_name
-    
+
     when /the guides page/i
       @environment + "guides/home"
-
     when /the watircuke page/i
       @environment + "richdownie/watircuke/tree/master"
-            
+    when /the cucumber page/i
+      @environment + "aslakhellesoy/cucumber/tree/master"
+    when /the homepage/i
+      @environment
+
     # Add more page name => path mappings here
-    
+
     else
       raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
         "Now, go and add a mapping in features/support/paths.rb"
@@ -17,6 +20,4 @@ module NavigationHelpers
   end
 end
 
-World do 
-  extend NavigationHelpers
-end
+World(NavigationHelpers)

data/lib/watircuke.rb

@@ -1,7 +1,11 @@
-require "cucumber"
+#
+# Watircuke
+#
+# Commonly used watir steps
+#
+#
+require 'cucumber'
 require 'spec'
-#require File.join(File.dirname(__FILE__), '..', 'features', 'support', 'env')
-# Dir[File.join(File.dirname(__FILE__), '..', 'features', 'step_definitions', '*rb')].each { |file| require file }
 
 #
 # Environment
@@ -37,39 +41,40 @@ end
 #
 # Browsing
 #
-When /^I follow "([^\"]*)"$/ do |l|
-  @browser.link(:text, l).click
+Given /^I am on (.+)$/ do |page_name|
+  @browser.goto(path_to(page_name))
 end
 
 When /^I (visit|go to) the (.+)$/ do |_, text|
   @browser.goto(@environment + text)
 end
 
-Given /^I am on (.+)$/ do |page_name|
-  @browser.goto(path_to(page_name))
+When /^I (click|follow) "([^\"]*)"$/ do |_, id|
+  link = @browser.link(:text, id).click rescue @browser.link(:id, id).click
 end
 
-# Then /^I should be on (.+)$/ do |page_name|
-#   URI.parse(current_url).path.should == path_to(page_name)
-# end
+Then /^I should be on (.+)$/ do |page_name|
+  URI.parse(@browser.url).path.should == path_to(page_name)
+end
 
 #
 # Should see
 #
+#
 Then /^I should see "([^\"]*)"$/ do |text|
-  @browser.should contains_text(text)
+  @browser.contains_text(text).should be_true
 end
 
 Then /^I should not see "([^\"]*)"$/ do |text|
-  @browser.should_not contains_text(text)
+  @browser.contains_text(text).should be_false
 end
 
-Then /^I should see "([^\"]*)" (\d+) times*$/ do |text, count|
-  res = @browser.body
-  (count.to_i - 1).times { res.sub!(/#{text}/, "")}
-  res.should contain(text)
-  res.sub(/#{text}/, "").should_not contain(text)
-end
+# Then /^I should see "([^\"]*)" (\d+) times*$/ do |text, count|
+#   res = @browser.body
+#   (count.to_i - 1).times { res.sub!(/#{text}/, "")}
+#   res.should contain(text)
+#   res.sub(/#{text}/, "").should_not contain(text)
+# end
 
 Given /I verify the page contains a div class "(.*)"/ do |byclass|
   @browser.div(:class, byclass).exists?.should be_true
@@ -87,9 +92,14 @@ Given /I verify the page contains the image "(.*)"/ do |image|
   @browser.image(:src, image).exists?.should be_true
 end
 
+Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
+  @browser.checkbox(label).should be_checked
+end
+
 #
 # Forms
 #
+#
 When /^I press "([^\"]*)"$/ do |b|
   @browser.button(:value, b).click
 end
@@ -110,14 +120,8 @@ When /^I check "([^\"]*)"$/ do |id|
   @browser.checkbox(:id, id).click
 end
 
-# When /^I uncheck "([^\"]*)"$/ do |field|
-#   uncheck(field)
-# end
-# Given /I click the "(.*)" checkbox/ do |id|
-# end
-
-Given /I wait "(.*)" seconds/ do |time|
-  sleep time.to_i
+When /^I uncheck "([^\"]*)"$/ do |id|
+  @browser.checkbox(field).clear
 end
 
 #
@@ -130,3 +134,14 @@ end
 Given /I click the "(.*)" span/  do |text|
   @browser.span(:text, text).click
 end
+
+Given /I wait (\d+) seconds*/ do |time|
+  sleep time.to_i
+end
+
+Given /^I wait until "([^\"]*)"$/ do |div|
+  7.times do |i|
+    break if @browser.div(:id, div).exists?
+    i == 7 ? raise(Watir::Exception::UnknownObjectException) : sleep(1)
+  end
+end

data/lib/webratcuke.rb

@@ -1,8 +1,14 @@
-# require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-
+#
+# Watircuke
+#
 # Commonly used webrat steps
 # http://github.com/brynary/webrat
+#
 
+#
+# Browsing
+#
+#
 Given /^I am on (.+)$/ do |page_name|
   visit path_to(page_name)
 end
@@ -11,14 +17,82 @@ When /^I go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^I press "([^\"]*)"$/ do |button|
-  click_button(button)
-end
-
 When /^I follow "([^\"]*)"$/ do |link|
   click_link(link)
 end
 
+Then /^I should be on (.+)$/ do |page_name|
+  URI.parse(current_url).path.should == path_to(page_name)
+end
+
+#
+# Should see
+#
+#
+Then /^I should see "([^\"]*)"$/ do |text|
+  response.should contain(text)
+end
+
+Then /^I should not see "([^\"]*)"$/ do |text|
+  response.should_not contain(text)
+end
+
+Then /^I should see "([^\"]*)" (\d+) times*$/ do |text, count|
+  res = response.body
+  (count.to_i - 1).times { res.sub!(/#{text}/, "")}
+  res.should contain(text)
+  res.sub(/#{text}/, "").should_not contain(text)
+end
+
+Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
+  field_labeled(field).value.should =~ /#{value}/
+end
+
+Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
+  field_labeled(field).value.should_not =~ /#{value}/
+end
+
+Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
+  field_labeled(label).should be_checked
+end
+
+Then /^I should see a (\S+) in the (\S+)$/ do |element, containing_element|
+  response.should have_tag("##{containing_element} .#{element}")
+end
+
+Then /^I should see the (\S+) in the (\S+)$/ do |element, containing_element|
+  response.should have_tag("##{containing_element} ##{element}")
+end
+
+Then /^I should see (\d+) (\S+) in the (\S+)$/ do |count, element, containing_element|
+  response.should have_tag("##{containing_element} .#{element.singularize}",:count => count.to_i)
+end
+
+Then /^I should see (\d+) to (\d+) (\S+) in the (\S+)$/ do |min, max, element, containing_element|
+  response.should have_tag("##{containing_element} .#{element.singularize}",min.to_i..max.to_i)
+end
+
+Then /^the (\S+) in the (\S+) should contain (a|an|the) (\S+)$/ do |middle_element, outer_element, a, inner_element|
+  response.should have_tag("##{outer_element} .#{middle_element} .#{inner_element}")
+end
+
+Then /^I should see the (\S+)$/ do |element_id|
+  response.should have_tag("##{element_id}")
+end
+
+Then /^I should see (a|an) (\S+)$/ do |a, element_class|
+  response.should have_tag(".#{element_class}")
+end
+
+
+#
+# Forms
+#
+#
+When /^I press "([^\"]*)"$/ do |button|
+  click_button(button)
+end
+
 When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
   fill_in(field, :with => value)
 end
@@ -88,6 +162,10 @@ When /^I select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label|
   select_date(date, :from => date_label)
 end
 
+When /^I choose "([^\"]*)"$/ do |field|
+  choose(field)
+end
+
 When /^I check "([^\"]*)"$/ do |field|
   check(field)
 end
@@ -96,45 +174,10 @@ When /^I uncheck "([^\"]*)"$/ do |field|
   uncheck(field)
 end
 
-When /^I choose "([^\"]*)"$/ do |field|
-  choose(field)
-end
-
 When /^I attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field|
   attach_file(field, path)
 end
 
-Then /^I should see "([^\"]*)"$/ do |text|
-  response.should contain(text)
-end
-
-Then /^I should see "([^\"]*)" (\d+) times*$/ do |text, count|
-  res = response.body
-  (count.to_i - 1).times { res.sub!(/#{text}/, "")}
-  res.should contain(text)
-  res.sub(/#{text}/, "").should_not contain(text)
-end
-
-
-Then /^I should not see "([^\"]*)"$/ do |text|
-  response.should_not contain(text)
-end
-
-Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
-  field_labeled(field).value.should =~ /#{value}/
-end
-
-Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
-  field_labeled(field).value.should_not =~ /#{value}/
-end
-
-Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
-  field_labeled(label).should be_checked
-end
-
-Then /^I should be on (.+)$/ do |page_name|
-  URI.parse(current_url).path.should == path_to(page_name)
-end
 
 # Steps that are generally useful and help encourage use of semantic
 # IDs and Class Names in your markup. In the steps below, a match following
@@ -152,30 +195,3 @@ Then /^I wait for ([0-9]+) seconds$/ do |delay|
   sleep delay.to_i
 end
 
-Then /^I should see a (\S+) in the (\S+)$/ do |element, containing_element|
-  response.should have_tag("##{containing_element} .#{element}")
-end
-
-Then /^I should see the (\S+) in the (\S+)$/ do |element, containing_element|
-  response.should have_tag("##{containing_element} ##{element}")
-end
-
-Then /^I should see (\d+) (\S+) in the (\S+)$/ do |count, element, containing_element|
-  response.should have_tag("##{containing_element} .#{element.singularize}",:count => count.to_i)
-end
-
-Then /^I should see (\d+) to (\d+) (\S+) in the (\S+)$/ do |min, max, element, containing_element|
-  response.should have_tag("##{containing_element} .#{element.singularize}",min.to_i..max.to_i)
-end
-
-Then /^the (\S+) in the (\S+) should contain (a|an|the) (\S+)$/ do |middle_element, outer_element, a, inner_element|
-  response.should have_tag("##{outer_element} .#{middle_element} .#{inner_element}")
-end
-
-Then /^I should see the (\S+)$/ do |element_id|
-  response.should have_tag("##{element_id}")
-end
-
-Then /^I should see (a|an) (\S+)$/ do |a, element_class|
-  response.should have_tag(".#{element_class}")
-end

data/watircuke.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watircuke}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rich Downie", "Marcos Piccinini"]
-  s.date = %q{2009-06-16}
+  s.date = %q{2009-06-17}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [
     "README"
@@ -16,19 +16,9 @@ Gem::Specification.new do |s|
      "README",
      "Rakefile",
      "VERSION",
+     "cucumber.yml",
+     "features/ajax.feature",
      "features/sample.feature",
-     "features/step_definitions/assertions.rb",
-     "features/step_definitions/buttons.rb",
-     "features/step_definitions/checkboxes.rb",
-     "features/step_definitions/javascript.rb",
-     "features/step_definitions/links.rb",
-     "features/step_definitions/pages.rb",
-     "features/step_definitions/radio_buttons.rb",
-     "features/step_definitions/select_lists.rb",
-     "features/step_definitions/sleep.rb",
-     "features/step_definitions/spans.rb",
-     "features/step_definitions/text_fields.rb",
-     "features/step_definitions/urls.rb",
      "features/support/env.rb",
      "features/support/paths.rb",
      "lib/watircuke.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-watircuke
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Rich Downie
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 -07:00
+date: 2009-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -27,19 +27,9 @@ files:
 - README
 - Rakefile
 - VERSION
+- cucumber.yml
+- features/ajax.feature
 - features/sample.feature
-- features/step_definitions/assertions.rb
-- features/step_definitions/buttons.rb
-- features/step_definitions/checkboxes.rb
-- features/step_definitions/javascript.rb
-- features/step_definitions/links.rb
-- features/step_definitions/pages.rb
-- features/step_definitions/radio_buttons.rb
-- features/step_definitions/select_lists.rb
-- features/step_definitions/sleep.rb
-- features/step_definitions/spans.rb
-- features/step_definitions/text_fields.rb
-- features/step_definitions/urls.rb
 - features/support/env.rb
 - features/support/paths.rb
 - lib/watircuke.rb

data/features/step_definitions/assertions.rb

@@ -1,23 +0,0 @@
-Given /I verify the page contains the text "(.*)"/ do |text|
-  assert(@browser.contains_text(text))
-end
-
-Given /I verify the page does not contain the text "(.*)"/ do |text|
-  assert_false(@browser.contains_text(text))
-end
-
-Given /I verify the page contains a div class "(.*)"/ do |byclass|
-  assert(@browser.div(:class, byclass).exists?)
-end
-
-Given /I verify the page contains a div id "(.*)"/ do |id|
-  assert(@browser.div(:id, id).exists?)
-end
-
-Given /I verify the page contains a link class "(.*)"/ do |byclass|
-  assert(@browser.link(:class, byclass).exists?)
-end
-
-Given /I verify the page contains the image "(.*)"/ do |image|
-  assert(@browser.image(:src, image).exists?)
-end

data/features/step_definitions/buttons.rb

@@ -1,3 +0,0 @@
-Given /I click the "(.*)" button/ do |value|
-  @browser.button(:value, value).click
-end

data/features/step_definitions/checkboxes.rb

@@ -1,3 +0,0 @@
-Given /I click the "(.*)" checkbox/ do |id|
-  @browser.checkbox(:id, id).click
-end

data/features/step_definitions/javascript.rb

@@ -1,3 +0,0 @@
-Given /From the "(.*)" link I fire the "(.*)" event/  do |text, event|
-  @browser.link(:text , text).fire_event(event)
-end

data/features/step_definitions/links.rb

@@ -1,3 +0,0 @@
-Given /I click the "(.*)" link/  do |text|
-  @browser.link(:text, text).click
-end

data/features/step_definitions/pages.rb

@@ -1,3 +0,0 @@
-Given /^I am on (.+)$/ do |page_name|
-  @browser.goto(path_to(page_name))
-end

data/features/step_definitions/radio_buttons.rb

@@ -1,3 +0,0 @@
-Given /I click the "(.*)" radio button/ do |id|
-  @browser.radio(:id, id).click
-end

data/features/step_definitions/select_lists.rb

@@ -1,3 +0,0 @@
-Given /I select "(.*)" from the select list "(.*)"/ do |value, id|
-  @browser.select_list(:id, id).select(value)
-end

data/features/step_definitions/sleep.rb

@@ -1,3 +0,0 @@
-Given /I wait "(.*)" seconds/ do |time|
-  sleep time.to_i
-end

data/features/step_definitions/spans.rb

@@ -1,3 +0,0 @@
-Given /I click the "(.*)" span/  do |text|
-  @browser.span(:text, text).click
-end

data/features/step_definitions/text_fields.rb

@@ -1,4 +0,0 @@
-Given /I fill in the text field "(.*)" with "(.*)"/ do |name, text|
-  @browser.text_field(:name, name).set(text)
-end
-

data/features/step_definitions/urls.rb

@@ -1,3 +0,0 @@
-Given /I visit "(.*)"/ do |text|
-  @browser.goto(@environment + text)
-end