eyes_selenium 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25174d9df260b6f0bfdfa1f5789a9d2842b42404
-  data.tar.gz: 0556cc0f386dc6806fe60b7441262953eaff6fe6
+  metadata.gz: 895307ec918bff0502fa49b951d2cbee119042fd
+  data.tar.gz: 6c7cc9590dd8e500c932666c4503e1b8cc4412d6
 SHA512:
-  metadata.gz: 3f36baf91d2e267d7aeb40fa90fab826a49fd751fea219a32f88a2f901a53e7c1f56dc071d1e51aca79ac1df85a06be7a7b46d96dd927cc7db4e1f6a3771f5a6
-  data.tar.gz: 710c72a2ea4459115a78e24e838fd7279bf4d8fdb53f734f4e24fb1a8dcfd9f90f240a67f9fdd8f905d17bffc121b827d48ff7306b88d7c47dda4ab344192e78
+  metadata.gz: 5153a65ae4f19faa5c26489b82aa6e37cde45c3d3015f83951bfaa646dc92e777509a555b090c6d04085dbb16372096dcef980067b5743f0d77027c366395869
+  data.tar.gz: 167494187f8870bbc825a20cd1efb386c37fe0392d09941c6be645ead06a677c83d6148ef5469aefb5fe21edd98d9135d927195b107cdd7dc5bc046cf05205d2

data/.gitignore

@@ -1,3 +1,4 @@
+.*.swp
 *.gem
 *.rbc
 .bundle
@@ -13,7 +14,6 @@ pkg
 rdoc
 .idea/
 .idea-*/
-spec/
 spec/reports
 test/tmp
 test/version_tmp

data/lib/eyes_selenium/eyes/driver.rb

@@ -55,12 +55,38 @@ class  Applitools::Driver
     Applitools::EyesKeyboard.new(self, driver.keyboard)
   end
 
-  def find_element(by, selector)
-    Applitools::Element.new(self, driver.find_element(by, selector))
+  FINDERS = {
+          :class             => 'class name',
+          :class_name        => 'class name',
+          :css               => 'css selector',
+          :id                => 'id',
+          :link              => 'link text',
+          :link_text         => 'link text',
+          :name              => 'name',
+          :partial_link_text => 'partial link text',
+          :tag_name          => 'tag name',
+          :xpath             => 'xpath',
+        }
+
+  def find_element(*args)
+    how, what = extract_args(args)
+
+    # Make sure that "how" is a valid locator.
+    unless FINDERS[how.to_sym]
+      raise ArgumentError, "cannot find element by #{how.inspect}"
+    end
+
+    Applitools::Element.new(self, driver.find_element(how, what))
   end
 
-  def find_elements(by, selector)
-    driver.find_elements(by, selector).map { |el| Applitools::Element.new(self, el) }
+  def find_elements(*args)
+    how, what = extract_args(args)
+
+    unless FINDERS[how.to_sym]
+      raise ArgumentError, "cannot find element by #{how.inspect}"
+    end
+
+    driver.find_elements(how, what).map { |el| Applitools::Element.new(self, el) }
   end
 
   def ie?
@@ -99,7 +125,7 @@ class  Applitools::Driver
 
     def get_local_ip
       begin
-        Socket.ip_address_list.detect do |intf| 
+        Socket.ip_address_list.detect do |intf|
           intf.ipv4? and !intf.ipv4_loopback? and !intf.ipv4_multicast?
         end.ip_address
       rescue SocketError => e
@@ -107,6 +133,29 @@ class  Applitools::Driver
       end
     end
 
+    def extract_args(args)
+      case args.size
+      when 2
+        args
+      when 1
+        arg = args.first
+
+        unless arg.respond_to?(:shift)
+          raise ArgumentError, "expected #{arg.inspect}:#{arg.class} to respond to #shift"
+        end
+
+        # this will be a single-entry hash, so use #shift over #first or #[]
+        arr = arg.dup.shift
+        unless arr.size == 2
+          raise ArgumentError, "expected #{arr.inspect} to have 2 elements"
+        end
+
+        arr
+      else
+        raise ArgumentError, "wrong number of arguments (#{args.size} for 2)"
+      end
+    end
+
 end
 
 ## .bridge, .session_id and .server_url are private methods in Selenium::WebDriver gem

data/lib/eyes_selenium/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/spec/find_spec.rb

@@ -0,0 +1,53 @@
+require 'eyes_selenium'
+
+describe 'find_element(s)' do
+
+  before(:each) do |example|
+    @eyes = Applitools::Eyes.new
+    @eyes.api_key = ENV['APPLITOOLS_ACCESS_KEY']
+    driver = Selenium::WebDriver.for :firefox
+    @driver = @eyes.open(app_name: 'the-internet', test_name: example.metadata[:full_description],
+          viewport_size: {width: 800, height: 600}, driver: driver)
+    @driver.get 'http://the-internet.herokuapp.com'
+  end
+
+  after(:each) do
+    @eyes.close
+    @driver.quit
+  end
+
+  context 'single element' do
+
+    it 'explicit' do
+      link = @driver.find_element(:css, 'a')
+      expect(link).to_not be nil
+      expect(link).to be_a Applitools::Element
+    end
+
+    it 'by hash' do
+      link = @driver.find_element(css: 'a')
+      expect(link).to_not be nil
+      expect(link).to be_a Applitools::Element
+    end
+
+  end
+
+  context 'all elements' do
+
+    it 'explicit' do
+      collection = @driver.find_elements(css: 'a')
+      expect(collection).to_not be nil
+      expect(collection[0]).to be_a Applitools::Element
+      expect(collection[1]).to be_a Applitools::Element
+    end
+
+    it 'by hash' do
+      collection = @driver.find_elements(css: 'a')
+      expect(collection).to_not be nil
+      expect(collection[0]).to be_a Applitools::Element
+      expect(collection[1]).to be_a Applitools::Element
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Applitools team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -165,6 +165,7 @@ files:
 - lib/eyes_selenium/utils.rb
 - lib/eyes_selenium/utils/image_delta_compressor.rb
 - lib/eyes_selenium/version.rb
+- spec/find_spec.rb
 - test_script.rb
 homepage: http://www.applitools.com
 licenses:
@@ -190,4 +191,5 @@ rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Applitools Ruby SDK
-test_files: []
+test_files:
+- spec/find_spec.rb