conformity 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b8455307bec73a30aafcac8703555a260a59683
-  data.tar.gz: 740f87bd8c214605fdd86d611d0c24306704a2a0
+  metadata.gz: e405b329514c0569897e41ff7e62a3b7d67e552b
+  data.tar.gz: 2580059337a97a3d998c400dc0450d1b90544004
 SHA512:
-  metadata.gz: 6a957db00a62c401b20343edfd5dd308f51fe518c600a4f866aea68ff7a7c7725507b574b2f9fab3c068f46b09231c46cd9bdc6ccf7344d88cea84eab11f7537
-  data.tar.gz: 571371f18eb5df39db3f92575ff8b9fe775275967f3b3529432ec9337b0b53602fb65dfe17d21709cedc098eefe0dc73657930cae736182de3a9d446eaafddc5
+  metadata.gz: bb1593b4682f3d2a468cd73b66ca56b42772cc1048921cf333e1ceab75f52acdeeb935f06bf3683608b1c9d453cb0d070a18769bb14db2f1e14fac91ba20efc1
+  data.tar.gz: 7f522be5f5bbd0dcd1abbd2dbb95a673c923fe10fdd201dcf46005eb2327ae982a5af5b40fe75695147ce575c85c0b508db82de35ff1897e14bb06472e62808c

data/lib/conformity/actions.rb

@@ -15,45 +15,71 @@ module Conformity
     end
 
     def click_on(locator, options={})
-      session.find(locator, options).click
-      screenshot(name) if Conformity.log_screenshots
+      begin
+        session.click_on(locator, options)
+      rescue Capybara::ElementNotFound
+        session.find(locator, options).click
+      end
+      screenshot(:click_on) if Conformity.log_screenshots
     end
-    alias_method :click_link_or_button, :click_on
-    alias_method :click_link, :click_on
-    alias_method :click_button, :click_on
 
     def fill_in(locator, options={})
-      raise "Must pass a hash containing 'with'" if not options.is_a?(Hash) or not options.has_key?(:with)
-      with = options.delete(:with)
-      fill_options = options.delete(:fill_options)
-      session.find(locator, options).set(with, fill_options)
+      begin
+        dup = options.dup
+        session.fill_in(locator, dup)
+      rescue Capybara::ElementNotFound
+        raise "Must pass a hash containing 'with'" if not options.is_a?(Hash) or not options.has_key?(:with)
+        with = options.delete(:with)
+        fill_options = options.delete(:fill_options)
+        session.find(locator, options).set(with)
+      end
       screenshot(:fill_in) if Conformity.log_screenshots
     end
 
     def choose(locator, options={})
-      session.find(locator, options).set(true)
+      begin
+        session.choose(locator, options)
+      rescue Capybara::ElementNotFound
+        session.find(locator, options).set(true)
+      end
       screenshot(:choose) if Conformity.log_screenshots
     end
 
     def check(locator, options={})
-      session.find(locator, options).set(true)
+      begin
+        session.check(locator, options)
+      rescue Capybara::ElementNotFound
+        session.find(locator, options).set(true)
+      end
       screenshot(:check) if Conformity.log_screenshots
     end
 
     def uncheck(locator, options={})
-      session.find(locator, options).set(false)
+      begin
+        session.uncheck(locator, options)
+      rescue Capybara::ElementNotFound
+        session.find(locator, options).set(false)
+      end
       screenshot(:uncheck) if Conformity.log_screenshots
     end
 
     def select(value, options={})
-      options.delete(:from)
-      session.find(value, options).select_option
+      begin
+        session.select(value, options)
+      rescue Capybara::ElementNotFound
+        options.delete(:from)
+        session.find(value, options).select_option
+      end
       screenshot(:select) if Conformity.log_screenshots
     end
 
     def unselect(value, options={})
-      options.delete(:from)
-      session.find(value, options).unselect_option
+      begin
+        session.unselect(value, options)
+      rescue Capybara::ElementNotFound
+        options.delete(:from)
+        session.find(value, options).unselect_option
+      end
       screenshot(:unselect) if Conformity.log_screenshots
     end
 

data/lib/conformity/form.rb

@@ -34,11 +34,7 @@ module Conformity
       Capybara.current_session.reset!
       set_host(host)
 
-      begin
-        actions.instance_eval(&steps)
-      rescue => e
-        raise FillError, "#{e.message}"
-      end
+      actions.instance_eval(&steps)
       Capybara.page
     end
 

data/lib/conformity/version.rb

@@ -1,3 +1,3 @@
 module Conformity
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/conformity.rb

@@ -18,7 +18,6 @@ module Conformity
   class ConformityError < StandardError; end
   class ActionError < ConformityError; end
   class FieldError < ConformityError; end
-  class FillError < ConformityError; end
 
   class << self
     attr_writer :log_screenshots

data/spec/form_spec.rb

@@ -42,13 +42,13 @@ describe Form do
       skip "test not implemented"
     end
 
-    it 'raises FillError on failure' do
+    it 'raises error on failure' do
       form = Form.new do
         fill_in 'name', with: field(:name)
         click_on 'submit'
       end
 
-      expect { form.fill_with(name: 'Jane Doe') }.to raise_error(FillError)
+      expect { form.fill_with(name: 'Jane Doe') }.to raise_error
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conformity
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Nikias Kalpaxis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara