eyes_selenium 2.15.0 → 2.16.0

data/lib/applitools/version.rb

@@ -0,0 +1,3 @@
+module Applitools
+  VERSION = '2.16.0'.freeze
+end

data/lib/eyes_selenium.rb

@@ -1,41 +1,21 @@
-require 'json'
-require 'eyes_selenium/eyes_logger'
-require 'json'
 module Applitools
-  include EyesLogger
+  ROOT_DIR = File.join(File.dirname(File.expand_path(__FILE__)), 'applitools').freeze
+
+  Dir["#{ROOT_DIR}/*.rb"].each {|f| require f}
+  Dir["#{ROOT_DIR}/**/*.rb"].each {|f| require f}
+
   class EyesError < StandardError; end
   class EyesAbort < EyesError; end
 
   class TestFailedError < StandardError
     attr_accessor :test_results
-    def initialize(message, test_results=nil)
+
+    def initialize(message, test_results = nil)
       super(message)
+
       @test_results = test_results
     end
   end
-  class NewTestError < TestFailedError; end
 
-  require 'eyes_selenium/utils'
-  require 'eyes_selenium/version'
-  require 'eyes_selenium/eyes/agent_connector'
-  require 'eyes_selenium/eyes/batch_info'
-  require 'eyes_selenium/eyes/dimension'
-  require 'eyes_selenium/eyes/driver'
-  require 'eyes_selenium/eyes/element'
-  require 'eyes_selenium/eyes/environment'
-  require 'eyes_selenium/eyes/eyes'
-  require 'eyes_selenium/eyes/eyes_keyboard'
-  require 'eyes_selenium/eyes/eyes_mouse'
-  require 'eyes_selenium/eyes/failure_reports'
-  require 'eyes_selenium/eyes/match_level'
-  require 'eyes_selenium/eyes/match_window_data'
-  require 'eyes_selenium/eyes/match_window_task'
-  require 'eyes_selenium/eyes/mouse_trigger'
-  require 'eyes_selenium/eyes/region'
-  require 'eyes_selenium/eyes/screenshot_taker'
-  require 'eyes_selenium/eyes/session'
-  require 'eyes_selenium/eyes/start_info'
-  require 'eyes_selenium/eyes/test_results'
-  require 'eyes_selenium/eyes/text_trigger'
-  require 'eyes_selenium/eyes/viewport_size'
+  class NewTestError < TestFailedError; end
 end

data/spec/driver_passthrough_spec.rb

@@ -1,57 +1,57 @@
 require 'spec_helper'
 
-describe 'passthrough_methods' do
-
-  before(:each) do |example|
-    @eyes         = Applitools::Eyes.new
-    @eyes.api_key = 'dummy_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 STATIC_FILE
+describe 'passthrough methods' do
+  let(:static_file) { "file://#{File.dirname(__FILE__)}/fixtures/static_test_file.html" }
+  let(:eyes) { Applitools::Eyes.new }
+  let(:web_driver) { Selenium::WebDriver.for :phantomjs }
+
+  before do |example|
+    eyes.api_key = 'dummy_key'
+
+    @driver = eyes.open(app_name: 'Specs', test_name: example.metadata[:full_description],
+      viewport_size: {width: 800, height: 600}, driver: web_driver)
+    @driver.get static_file
   end
 
-  after(:each) do
-    @eyes.close
+  after do
+    eyes.close
+
     @driver.quit
   end
 
   it 'current_url' do
     url = @driver.current_url
-    expect(url).to eq STATIC_FILE
+    expect(url).to eq(static_file)
   end
 
   describe 'find_element(s)' do
     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
+        expect(link).not_to be_nil
+        expect(link).to be_a(Applitools::Selenium::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
+        expect(link).not_to be_nil
+        expect(link).to be_a(Applitools::Selenium::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
+        expect(collection).not_to be_nil
+        expect(collection[0]).to be_a(Applitools::Selenium::Element)
+        expect(collection[1]).to be_a(Applitools::Selenium::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
+        expect(collection).not_to be_nil
+        expect(collection[0]).to be_a(Applitools::Selenium::Element)
+        expect(collection[1]).to be_a(Applitools::Selenium::Element)
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,19 +1,16 @@
 require 'eyes_selenium'
 
-STATIC_FILE = "file://#{File.dirname(__FILE__)}/fixtures/static_test_file.html"
-
 RSpec.configure do |config|
   config.before do
-    #mocks out connection to Applitools.
-    allow_any_instance_of(Applitools::AgentConnector).to receive(:start_session) do
-      Applitools::Session.new('dummy_id', 'dummy_url', true )
+    allow_any_instance_of(Applitools::Base::ServerConnector).to receive(:start_session) do
+      Applitools::Base::Session.new('dummy_id', 'dummy_url', true )
     end
 
-    allow_any_instance_of(Applitools::AgentConnector).to receive(:stop_session) do
-      Applitools::TestResults.new()
+    allow_any_instance_of(Applitools::Base::ServerConnector).to receive(:stop_session) do
+      Applitools::Base::TestResults.new()
     end
 
-    allow_any_instance_of(Applitools::AgentConnector).to receive(:match_window) do
+    allow_any_instance_of(Applitools::Base::ServerConnector).to receive(:match_window) do
       true
     end
   end

data/test/appium_example_script.rb

@@ -0,0 +1,57 @@
+require_relative '../lib/eyes_selenium'
+
+require 'logger'
+require 'appium_lib'
+
+# Based on Appium example: https://github.com/appium/appium/blob/master/sample-code/examples/ruby/
+
+def android_caps
+  {
+      deviceName: 'Samsung Galaxy S4 Emulator',
+      platformName: 'Android',
+      platformVersion: 4.4,
+      app: ENV['ANDROID_NOTES_LIST_APP'],
+      appPackage: 'com.example.android.notepad',
+      appActivity: '.NotesList',
+      # orientation:         'landscape',
+      newCommandTimeout: 300
+  }
+end
+
+def ios_caps
+  {
+      deviceName: 'iPhone 6',
+      platformName: 'ios',
+      platformVersion: 8.3,
+      app: ENV['IOS_DEMO_APP'],
+      orientation: 'landscape',
+      newCommandTimeout: 300
+  }
+end
+
+def appium_opts
+  {
+      server_url: 'http://127.0.0.1:4723/wd/hub',
+  }
+end
+
+eyes = Applitools::Eyes.new
+eyes.log_handler = Logger.new(STDOUT)
+eyes.api_key = ENV['APPLITOOLS_API_KEY']
+
+begin
+  # driver = Appium::Driver.new({caps: android_caps, appium_lib: appium_opts})
+  driver = Appium::Driver.new(caps: ios_caps, appium_lib: appium_opts)
+  driver.start_driver
+  # driver.driver.rotate :landscape
+  puts "Screen size: #{driver.driver.manage.window.size}"
+  puts "orientation: #{driver.driver.orientation}"
+  puts driver.caps
+  eyes.open(app_name: 'Ruby SDK', test_name: 'Appium Notepad', driver: driver)
+
+  eyes.check_window('No notes')
+  eyes.close
+ensure
+  eyes.abort_if_not_closed
+  driver.driver_quit
+end

data/{test_script.rb → test/test_script.rb}

@@ -1,18 +1,16 @@
-require 'eyes_selenium'
-require 'logger'
+require_relative '../lib/eyes_selenium'
 
-# require 'openssl'
-# OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+require 'logger'
 
 eyes = Applitools::Eyes.new
-
-my_webdriver = Selenium::WebDriver.for :chrome
 eyes.api_key = ENV['APPLITOOLS_API_KEY']
 eyes.log_handler = Logger.new(STDOUT)
 
-
 begin
-  eyes.test(app_name: 'Ruby SDK', test_name: 'Applitools website test', viewport_size: {width: 1024, height: 768}, driver: my_webdriver) do |driver|
+  web_driver = Selenium::WebDriver.for :chrome
+
+  eyes.test(app_name: 'Ruby SDK', test_name: 'Applitools website test', viewport_size: {width: 900, height: 600},
+    driver: web_driver) do |driver|
     driver.get 'http://www.applitools.com'
     eyes.check_window('initial')
     eyes.check_region(:css, '.pricing', 'Pricing button')
@@ -20,5 +18,5 @@ begin
     eyes.check_window('pricing page')
   end
 ensure
-  my_webdriver.quit
+  web_driver.quit
 end

data/{watir_test.rb → test/watir_test_script.rb}

@@ -1,15 +1,17 @@
-require 'eyes_selenium'
+require_relative '../lib/eyes_selenium'
+
 require 'logger'
 require 'watir-webdriver'
 
-
-browser = Watir::Browser.new
 eyes = Applitools::Eyes.new
 eyes.api_key = ENV['APPLITOOLS_API_KEY']
 eyes.log_handler = Logger.new(STDOUT)
 
+browser = Watir::Browser.new
+
 begin
-  eyes.test(app_name: 'Ruby SDK', test_name: 'Applitools website test', viewport_size: {width: 1024, height: 768}, driver: browser) do |driver|
+  eyes.test(app_name: 'Ruby SDK', test_name: 'Applitools website test', viewport_size: {width: 900, height: 600},
+    driver: browser) do |driver|
     driver.get 'http://www.applitools.com'
     eyes.check_window('initial')
     eyes.check_region(:css, '.pricing', 'Pricing button')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_selenium
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.16.0
 platform: ruby
 authors:
-- Applitools team
+- Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.45.0
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: oily_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,33 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oily_png
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,30 +100,86 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appium_lib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -131,47 +201,46 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- appium_eyes_example.rb
 - certs/cacert.pem
 - eyes_selenium.gemspec
+- lib/applitools/base/batch_info.rb
+- lib/applitools/base/dimension.rb
+- lib/applitools/base/environment.rb
+- lib/applitools/base/mouse_trigger.rb
+- lib/applitools/base/point.rb
+- lib/applitools/base/region.rb
+- lib/applitools/base/server_connector.rb
+- lib/applitools/base/session.rb
+- lib/applitools/base/start_info.rb
+- lib/applitools/base/test_results.rb
+- lib/applitools/base/text_trigger.rb
+- lib/applitools/eyes.rb
+- lib/applitools/eyes_logger.rb
+- lib/applitools/method_tracer.rb
+- lib/applitools/selenium/driver.rb
+- lib/applitools/selenium/element.rb
+- lib/applitools/selenium/keyboard.rb
+- lib/applitools/selenium/match_window_data.rb
+- lib/applitools/selenium/match_window_task.rb
+- lib/applitools/selenium/mouse.rb
+- lib/applitools/selenium/viewport_size.rb
+- lib/applitools/utils/image_delta_compressor.rb
+- lib/applitools/utils/image_utils.rb
+- lib/applitools/utils/utils.rb
+- lib/applitools/version.rb
 - lib/eyes_selenium.rb
-- lib/eyes_selenium/capybara.rb
-- lib/eyes_selenium/eyes/agent_connector.rb
-- lib/eyes_selenium/eyes/batch_info.rb
-- lib/eyes_selenium/eyes/dimension.rb
-- lib/eyes_selenium/eyes/driver.rb
-- lib/eyes_selenium/eyes/element.rb
-- lib/eyes_selenium/eyes/environment.rb
-- lib/eyes_selenium/eyes/eyes.rb
-- lib/eyes_selenium/eyes/eyes_keyboard.rb
-- lib/eyes_selenium/eyes/eyes_mouse.rb
-- lib/eyes_selenium/eyes/failure_reports.rb
-- lib/eyes_selenium/eyes/match_level.rb
-- lib/eyes_selenium/eyes/match_window_data.rb
-- lib/eyes_selenium/eyes/match_window_task.rb
-- lib/eyes_selenium/eyes/mouse_trigger.rb
-- lib/eyes_selenium/eyes/region.rb
-- lib/eyes_selenium/eyes/screenshot_taker.rb
-- lib/eyes_selenium/eyes/session.rb
-- lib/eyes_selenium/eyes/start_info.rb
-- lib/eyes_selenium/eyes/test_results.rb
-- lib/eyes_selenium/eyes/text_trigger.rb
-- lib/eyes_selenium/eyes/viewport_size.rb
-- lib/eyes_selenium/eyes_logger.rb
-- lib/eyes_selenium/utils.rb
-- lib/eyes_selenium/utils/image_delta_compressor.rb
-- lib/eyes_selenium/utils/image_utils.rb
-- lib/eyes_selenium/version.rb
 - spec/driver_passthrough_spec.rb
 - spec/fixtures/static_test_file.html
 - spec/spec_helper.rb
-- test_script.rb
-- watir_test.rb
-homepage: http://www.applitools.com
+- test/appium_example_script.rb
+- test/test_script.rb
+- test/watir_test_script.rb
+homepage: https://www.applitools.com
 licenses:
 - Apache License, Version 2.0
 metadata: {}
@@ -199,3 +268,6 @@ test_files:
 - spec/driver_passthrough_spec.rb
 - spec/fixtures/static_test_file.html
 - spec/spec_helper.rb
+- test/appium_example_script.rb
+- test/test_script.rb
+- test/watir_test_script.rb