kelp 0.1.9 → 0.2.0

data/rails_generators/kelp/templates/web_steps.rb

@@ -28,7 +28,7 @@ World(Kelp::Visibility)
 I = /(?:|I )/
 TEXT = /"([^\"]+)"/
 REGEX = /\/([^\/]*)\//
-WITHIN = /(?: within (.+))?/
+WITHIN = /(?: within "?([^\"]+)"?)?/
 ELEMENT = /(?:field|checkbox|dropdown|button)/
 
 
@@ -303,7 +303,7 @@ end
 #     | Hair        | blonde  |
 #     | Has TV show | checked |
 #
-When /^#{I}fill in the following#{WITHIN}:$/ do |fields, selector|
+When /^#{I}fill in the following#{WITHIN}:$/ do |selector, fields|
   fill_in_fields(fields.rows_hash, :within => selector)
 end
 

data/spec/attribute_spec.rb

@@ -15,13 +15,13 @@ describe Kelp::Attribute, "should_be_disabled" do
     it "element does not exist" do
       lambda do
         should_be_disabled "nonexistent"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "element does not have the disabled attribute" do
       lambda do
         should_be_disabled "first_name"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 end
@@ -42,13 +42,13 @@ describe Kelp::Attribute, "should_be_enabled" do
     it "element does not exist" do
       lambda do
         should_be_enabled "nonexistent"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "element has the disabled attribute" do
       lambda do
         should_be_enabled "readonly"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 end

data/spec/checkbox_spec.rb

@@ -20,14 +20,14 @@ describe Kelp::Checkbox, "checkbox_should_be_checked" do
     it "the checkbox is unchecked by default" do
       lambda do
         checkbox_should_be_checked "I like salami"
-      end.should raise_error
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "the checkbox is unchecked programmatically" do
       uncheck "I like cheese"
       lambda do
         checkbox_should_be_checked "I like cheese"
-      end.should raise_error
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 
@@ -54,14 +54,14 @@ describe Kelp::Checkbox, "checkbox_should_not_be_checked" do
     it "the checkbox is checked by default" do
       lambda do
         checkbox_should_not_be_checked "I like cheese"
-      end.should raise_error
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "the checkbox is checked programmatically" do
       check "I like salami"
       lambda do
         checkbox_should_not_be_checked "I like salami"
-      end.should raise_error
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 

data/spec/dropdown_spec.rb

@@ -27,20 +27,20 @@ describe Kelp::Dropdown, "dropdown_should_equal" do
     it "the option does not have the 'selected' attribute" do
       lambda do
         dropdown_should_equal "Height", "Tall"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "the option is not the first one selected by default" do
       lambda do
         dropdown_should_equal "Weight", "Medium"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "the option was not the one chosen programmatically" do
       select "Tall", :from => "Height"
       lambda do
         dropdown_should_equal "Height", "Average"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 
@@ -78,7 +78,7 @@ describe Kelp::Dropdown, "dropdown_should_include" do
     it "a single option does not exist in the dropdown" do
       lambda do
         dropdown_should_include "Height", "Midget"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "any of several options do not exist in the dropdown" do
@@ -89,7 +89,7 @@ describe Kelp::Dropdown, "dropdown_should_include" do
           "Tall",
           "Giant",
         ]
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 end
@@ -120,7 +120,7 @@ describe Kelp::Dropdown, "dropdown_should_not_include" do
     it "a single option exists in the dropdown" do
       lambda do
         dropdown_should_not_include "Height", "Short"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "any of several options exist in the dropdown" do
@@ -131,7 +131,7 @@ describe Kelp::Dropdown, "dropdown_should_not_include" do
           "Behemoth",
           "Tall",
         ]
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 end
@@ -161,20 +161,20 @@ describe Kelp::Dropdown, "dropdown_value_should_equal" do
     it "the option with the 'selected' attribute has a different value" do
       lambda do
         dropdown_value_should_equal "Height", "99"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "the first option selected by default does not have given value" do
       lambda do
         dropdown_value_should_equal "Weight", "2"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "the programmatically chosen option has a different value" do
       select "Tall", :from => "Height"
       lambda do
         dropdown_value_should_equal "Height", "2"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 end

data/spec/field_spec.rb

@@ -29,7 +29,7 @@ describe Kelp::Field, "field_should_be_empty" do
         fill_in "first_name", :with => "Brian"
         lambda do
           field_should_be_empty "first_name"
-        end.should raise_error(RuntimeError)
+        end.should raise_error(Kelp::Unexpected)
       end
     end
 
@@ -38,7 +38,7 @@ describe Kelp::Field, "field_should_be_empty" do
         fill_in "First name", :with => "Brian"
         lambda do
           field_should_be_empty "First name"
-        end.should raise_error(RuntimeError)
+        end.should raise_error(Kelp::Unexpected)
       end
     end
   end
@@ -71,14 +71,14 @@ describe Kelp::Field, "field_should_contain" do
       it "is empty" do
         lambda do
           field_should_contain "first_name", "Brian"
-        end.should raise_error(rspec_unexpected)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "has a different value" do
         fill_in "first_name", :with => "Judith"
         lambda do
           field_should_contain "first_name", "Brian"
-        end.should raise_error(rspec_unexpected)
+        end.should raise_error(Kelp::Unexpected)
       end
     end
 
@@ -86,14 +86,14 @@ describe Kelp::Field, "field_should_contain" do
       it "is empty" do
         lambda do
           field_should_contain "First name", "Brian"
-        end.should raise_error(rspec_unexpected)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "has a different value" do
         fill_in "First name", :with => "Judith"
         lambda do
           field_should_contain "First name", "Brian"
-        end.should raise_error(rspec_unexpected)
+        end.should raise_error(Kelp::Unexpected)
       end
     end
 
@@ -154,7 +154,7 @@ describe Kelp::Field, "fields_should_contain" do
       it "are empty" do
         lambda do
           fields_should_contain "first_name" => "Terry", "last_name" => "Jones"
-        end.should raise_error(rspec_unexpected)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "do not all match" do
@@ -162,7 +162,7 @@ describe Kelp::Field, "fields_should_contain" do
         fill_in "last_name", :with => "Gilliam"
         lambda do
           fields_should_contain "first_name" => "Terry", "last_name" => "Jones"
-        end.should raise_error(rspec_unexpected)
+        end.should raise_error(Kelp::Unexpected)
       end
     end
 
@@ -170,7 +170,7 @@ describe Kelp::Field, "fields_should_contain" do
       it "are empty" do
         lambda do
           fields_should_contain "First name" => "Terry", "Last name" => "Jones"
-        end.should raise_error(rspec_unexpected)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "do not all match" do
@@ -178,7 +178,7 @@ describe Kelp::Field, "fields_should_contain" do
         fill_in "Last name", :with => "Gilliam"
         lambda do
           fields_should_contain "First name" => "Terry", "Last name" => "Jones"
-        end.should raise_error(rspec_unexpected)
+        end.should raise_error(Kelp::Unexpected)
       end
     end
 
@@ -229,19 +229,19 @@ describe Kelp::Field, "fill_in_field" do
     it "filling a nonexistent field" do
       lambda do
         fill_in_field "Middle name", "Kaminsky"
-      end.should raise_error(Capybara::ElementNotFound)
+      end.should raise_error(Kelp::FieldNotFound)
     end
 
     it "selecting a nonexistent value from a dropdown" do
       lambda do
         fill_in_field "Height", "Gigantic"
-      end.should raise_error(Capybara::ElementNotFound)
+      end.should raise_error(Kelp::OptionNotFound)
     end
 
     it "filling a field in the wrong scope" do
       lambda do
         fill_in_field_within "#preferences_form", "First name", "Mel"
-      end.should raise_error(Capybara::ElementNotFound)
+      end.should raise_error(Kelp::FieldNotFound)
     end
   end
 end
@@ -316,14 +316,14 @@ describe Kelp::Field, "fill_in_fields" do
     it "filling a nonexistent field" do
       lambda do
         fill_in_fields "Middle name" => "Kaminsky"
-      end.should raise_error(Capybara::ElementNotFound)
+      end.should raise_error(Kelp::FieldNotFound)
     end
 
     it "filling a field in the wrong scope" do
       lambda do
         fill_in_fields_within "#preferences_form",
           "First name" => "Mel"
-      end.should raise_error(Capybara::ElementNotFound)
+      end.should raise_error(Kelp::FieldNotFound)
     end
   end
 

data/spec/navigation_spec.rb

@@ -102,7 +102,7 @@ describe Kelp::Navigation, "should_be_on_page" do
       visit('/home')
       lambda do
         should_be_on_page '/form'
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 end
@@ -124,7 +124,7 @@ describe Kelp::Navigation, "should_have_query" do
     it "expected params when actual query is empty" do
       lambda do
         should_have_query :username => 'tony'
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,12 @@
 require 'rspec'
-
-# Supported drivers
 require 'capybara'
 require 'capybara/dsl'
-#require 'webrat'
 
 require 'kelp'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'examples', 'sinatra_app', 'app'))
 
 RSpec.configure do |config|
   config.include Capybara
-  #config.include Webrat::Methods
 
   config.include Kelp::Attribute
   config.include Kelp::Checkbox
@@ -21,7 +17,6 @@ RSpec.configure do |config|
   config.include Kelp::Visibility
 
   config.before do
-    #Kelp.driver = :webrat
     Capybara.default_driver = :rack_test
     Capybara.default_selector = :css
     Capybara.app = TestApp
@@ -33,7 +28,3 @@ RSpec.configure do |config|
   end
 end
 
-#Webrat.configure do |config|
-  #config.mode = :rack
-#end
-

data/spec/visibility_spec.rb

@@ -1,5 +1,40 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+describe Kelp::Visibility, "page_contains?" do
+  before(:each) do
+    visit('/home')
+  end
+
+  context "returns true when" do
+    it "String exists" do
+      page_contains?("Hello world").should be_true
+    end
+
+    it "Regexp matches" do
+      page_contains?(/(Hello|Goodbye) world/).should be_true
+    end
+  end
+
+  context "returns false when" do
+    it "String does not exist" do
+      page_contains?("Jimmy eat world").should be_false
+    end
+
+    it "Regexp does not match" do
+      page_contains?(/(Ni-hao|Konnichiwa) world/).should be_false
+    end
+  end
+
+  context "raises exception when" do
+    it "invalid argument type is given" do
+      lambda do
+        page_contains?(1234)
+      end.should raise_error(ArgumentError)
+    end
+  end
+end
+
+
 describe Kelp::Visibility, "should_see" do
   before(:each) do
     visit('/home')
@@ -238,19 +273,19 @@ describe Kelp::Visibility, "should_see_in_same_row" do
     it "two strings exist, but are not in the same row" do
       lambda do
         should_see_in_same_row ["Eric", "John"]
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "two strings are in the same row, but a third is not" do
       lambda do
         should_see_in_same_row ["Eric", "Edit", "Delete"]
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "two strings are in the same row, but outside the given scope" do
       lambda do
         should_see_in_same_row ["Eric", "Edit"], :within => "#table_b"
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
   end
 end
@@ -282,113 +317,15 @@ describe Kelp::Visibility, "should_not_see_in_same_row" do
     it "two strings are in the same row" do
       lambda do
         should_not_see_in_same_row ["Eric", "Edit"]
-      end.should raise_error(rspec_unexpected)
+      end.should raise_error(Kelp::Unexpected)
     end
 
     it "two strings are in the same row within a given scope" do
       lambda do
         should_not_see_in_same_row ["Eric", "Edit"], :within => "#table_a"
-      end.should raise_error(rspec_unexpected)
-    end
-  end
-end
-
-
-describe Kelp::Visibility, "page_should_contain" do
-  before(:each) do
-    visit('/home')
-  end
-
-  context "passes when" do
-    context "String" do
-      it "exists" do
-        page_should_contain "Hello world"
-        page_should_contain "Goodbye world"
-      end
-    end
-    context "Regexp" do
-      it "matches" do
-        page_should_contain /(Hello|Goodbye) world/
-        page_should_contain /\d\d\d-\d\d\d\d/
-      end
-    end
-  end
-
-  context "fails when" do
-    context "String" do
-      it "does not exist" do
-        lambda do
-          page_should_contain "Wazzup world"
-        end.should raise_error(rspec_unexpected)
-      end
-    end
-
-    context "Regexp" do
-      it "does not match" do
-        lambda do
-          page_should_contain /(Foo|Bar|Baz) world/
-        end.should raise_error(rspec_unexpected)
-      end
-    end
-
-    it "not a String or Regexp" do
-      lambda do
-        page_should_contain 123
-      end.should raise_error(ArgumentError)
-    end
-  end
-
-end
-
-
-describe Kelp::Visibility, "page_should_not_contain" do
-  before(:each) do
-    visit('/home')
-  end
-
-  context "passes when" do
-    context "String" do
-      it "does not exist" do
-        page_should_not_contain "Wazzup world"
-      end
-    end
-
-    context "Regexp" do
-      it "does not match" do
-        page_should_not_contain /(Foo|Bar|Baz) world/
-      end
-    end
-  end
-
-  context "fails when" do
-    context "String" do
-      it "exists" do
-        lambda do
-          page_should_not_contain "Hello world"
-        end.should raise_error(rspec_unexpected)
-        lambda do
-          page_should_not_contain "Goodbye world"
-        end.should raise_error(rspec_unexpected)
-      end
-    end
-    context "Regexp" do
-      it "matches" do
-        lambda do
-          page_should_not_contain /(Hello|Goodbye) world/
-        end.should raise_error(rspec_unexpected)
-        lambda do
-          page_should_not_contain /\d\d\d-\d\d\d\d/
-        end.should raise_error(rspec_unexpected)
-      end
-    end
-
-    it "not a String or Regexp" do
-      lambda do
-        page_should_not_contain 123
-      end.should raise_error(ArgumentError)
+      end.should raise_error(Kelp::Unexpected)
     end
   end
-
 end