conformity 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03f5bb53373a113a0035f5d41f94d396c70f6e58
-  data.tar.gz: 880e740b3ba9efd4db77ac939dd5ad72012eca69
+  metadata.gz: 7b8455307bec73a30aafcac8703555a260a59683
+  data.tar.gz: 740f87bd8c214605fdd86d611d0c24306704a2a0
 SHA512:
-  metadata.gz: b053d5f3f3eacc49e888927c696252b88dc9bf65ae1bde18d66290c40aa6d4ccba7d476dfb716dac3dc701ca0cd6da99a79b609704bed0be2454303d6729af8b
-  data.tar.gz: 208caa041d7abcbfcd5b3b52a6b839a3aae2defb56796fa30b904dd2ccecca5237ddb35b2ff91be8376c5ac508176166128270e8a001e1c9fe81225d11f453f9
+  metadata.gz: 6a957db00a62c401b20343edfd5dd308f51fe518c600a4f866aea68ff7a7c7725507b574b2f9fab3c068f46b09231c46cd9bdc6ccf7344d88cea84eab11f7537
+  data.tar.gz: 571371f18eb5df39db3f92575ff8b9fe775275967f3b3529432ec9337b0b53602fb65dfe17d21709cedc098eefe0dc73657930cae736182de3a9d446eaafddc5

data/README.md

@@ -36,9 +36,9 @@ form.field_names
 # => [:query]
 
 # returns Capybara::Session, can call #html etc. on it
-form.fill_with('news') # perform google search for 'news'
-form.fill_with('what is the third planet from the sun')
-form.fill_with('alternatives to gmail') 
+form.fill_with(query: 'news') # perform google search for 'news'
+form.fill_with(query: 'what is the third planet from the sun')
+form.fill_with(query: 'alternatives to gmail') 
 
 # check if the last form submission succeeded (if success conditions were set)
 form.success?

data/lib/conformity/actions.rb

@@ -14,6 +14,49 @@ module Conformity
       fields.value(name)
     end
 
+    def click_on(locator, options={})
+      session.find(locator, options).click
+      screenshot(name) 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)
+      screenshot(:fill_in) if Conformity.log_screenshots
+    end
+
+    def choose(locator, options={})
+      session.find(locator, options).set(true)
+      screenshot(:choose) if Conformity.log_screenshots
+    end
+
+    def check(locator, options={})
+      session.find(locator, options).set(true)
+      screenshot(:check) if Conformity.log_screenshots
+    end
+
+    def uncheck(locator, options={})
+      session.find(locator, options).set(false)
+      screenshot(:uncheck) if Conformity.log_screenshots
+    end
+
+    def select(value, options={})
+      options.delete(:from)
+      session.find(value, options).select_option
+      screenshot(:select) if Conformity.log_screenshots
+    end
+
+    def unselect(value, options={})
+      options.delete(:from)
+      session.find(value, options).unselect_option
+      screenshot(:unselect) if Conformity.log_screenshots
+    end
+
     def method_missing(name, *args, &block)
       if ACTIONS.include?(name)
         session.send(name, *args, &block)
@@ -25,11 +68,6 @@ module Conformity
       end
     end
 
-    # so Kernel#select isn't called
-    def select(*args, &block)
-      session.send(:select, *args, &block)
-    end
-
     def screenshot(name)
       file_name = "#{Time.now.to_i}_#{name}.png"
       full_path = Conformity.screenshots_folder + "/" + file_name

data/lib/conformity/fields.rb

@@ -16,16 +16,20 @@ module Conformity
       fields.map { |field| field.name }
     end
 
-    def set_values(values)
-      fields.each_with_index { |field, i| field.value = values[i] }
+    def find(name)
+      fields.select { |field| field.name == name }.first
     end
 
     def value(name)
       find(name).value
     end
 
-    def find(name)
-      fields.select { |field| field.name == name }.first
+    def set(name, value)
+      find(name).value = value
+    end
+
+    def set_all(hash)
+      hash.each { |name, value| set(name, value) }
     end
   end
 end

data/lib/conformity/form.rb

@@ -42,8 +42,8 @@ module Conformity
       Capybara.page
     end
 
-    def fill_with(*field_values)
-      fields_container.set_values(field_values)
+    def fill_with(field_hash)
+      fields_container.set_all(field_hash)
       fill
     end
 

data/lib/conformity/version.rb

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

data/spec/actions_spec.rb

@@ -19,26 +19,18 @@ describe Conformity::Actions do
   end
 
   describe "#method_missing" do
-    it "delegates action calls to session" do
+    it "delegates visit to session" do
       expect(@session).to receive(:visit).with("/")
       @actions.visit('/')
     end
 
-    it "ignores success conditions" do
-      expect { @actions.has_status_code?; @actions.has_content? }.to_not raise_error
+    it "delegates find to session" do
+      expect(@session).to receive(:find).with("#id")
+      @actions.find("#id")
     end
-  end
 
-  describe "#select" do
-    it "is called on session" do
-      expect(@session).to receive(:select)
-      @actions.select('Yes')
-    end
-    
-    it "is not called on Kernel" do
-      skip "not sure how to test"
-      expect(Kernel).to_not receive(:select)
-      @actions.select('Yes')
+    it "ignores success conditions" do
+      expect { @actions.has_status_code?; @actions.has_content? }.to_not raise_error
     end
   end
 

data/spec/fields_spec.rb

@@ -40,16 +40,26 @@ describe Conformity::Fields do
     end
   end
 
-  describe "#set_values" do
-    it "sets the value of fields" do
-      field_a = double()
-      field_b = double()
+  describe "#set" do
+    it "sets the value of field name" do
+      field = double("Field", name: "number")
+      @fields.add_field(field)
+      expect(field).to receive(:value=).with("867-5309")
+      @fields.set("number", "867-5309")
+    end
+  end
+
+  describe "#set_all" do
+    it "sets the value of all fields" do
+      name = double("Field", name: "name")
+      number = double("Field", name: "number")
+      @fields.add_field(name)
+      @fields.add_field(number)
 
-      allow(@fields).to receive(:fields) { [field_a, field_b] }
-      expect(field_a).to receive(:value=).with('1')
-      expect(field_b).to receive(:value=).with('2')
+      expect(name).to receive(:value=).with("Jenny")
+      expect(number).to receive(:value=).with("867-5309")
 
-      @fields.set_values(['1', '2'])
+      @fields.set_all("name" => "Jenny", "number" => "867-5309")
     end
   end
 end

data/spec/form_spec.rb

@@ -48,7 +48,7 @@ describe Form do
         click_on 'submit'
       end
 
-      expect { form.fill_with('Jane Doe') }.to raise_error(FillError)
+      expect { form.fill_with(name: 'Jane Doe') }.to raise_error(FillError)
     end
   end
 

metadata

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