calliper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6744c434f323e9ef6685ecb0ac6eb918fa8c5711
-  data.tar.gz: 3384b9224c9767b45edc52233c707ecd060ca059
+  metadata.gz: e618ec8d3e69dfc29492b01d8568aa0d7c3f1ef1
+  data.tar.gz: 618a6203abb30729417b52b68ab985ee7d236985
 SHA512:
-  metadata.gz: 07b6681def6e25bfb470f39f4250b3a904fa0fd20067ca3c9da52e35dffc42b41719573f3668ce57706b11a2a533b914c76eb52cbade3f50786d94b4ccb31ae3
-  data.tar.gz: b62ef597f198e12f311487a2b6d5131ccdafbc771e9145913355b075ef27335cf0cd85213cc927993ae0d434bf54556ef3b00da5dbc31bd9451ac794cb0c39ee
+  metadata.gz: 59e1c7f61fd7b67f1ec7675f223512d4feb48a95cdf99e32cc78697e021b8a49501f5d19bb94842fad471036237f1795b05019259adcb6ef2e581c601d7bea7b
+  data.tar.gz: 704ecbe792d7e60f3d0b7a3e36a4b409967933c44030a026a4ba97d8249c192d14ee75b1652f48fe9a58746c4d4f7fe10371faa8f4b986ce56e496fb45f15f85

data/.gitignore

@@ -1 +1,2 @@
 *.log
+*.gem

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/calliper.gemspec

@@ -18,6 +18,9 @@ Gem::Specification.new do |gem|
   gem.signing_key   = File.expand_path('~/.ssh/gem-private_key.pem') if $0 =~ /gem\z/
 
   gem.add_dependency 'selenium-webdriver'
-  gem.add_development_dependency 'rack'
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'json'
+  gem.add_development_dependency 'sinatra'
   gem.add_development_dependency 'minitest'
 end

data/lib/calliper.rb

@@ -3,15 +3,24 @@ require 'calliper/config'
 require 'calliper/page'
 require 'calliper/server'
 require 'calliper/webdriver'
-require 'calliper/rails' if defined?(Rails)
 require 'calliper/minitest' if defined?(Minitest)
 
 module Calliper
-  def self.server?
-    false
+  def self.enable!
+    application = Config.application || (::Rails.application if defined?(::Rails))
+    raise "No application configured" unless application
+
+    logger = ::Rails.logger if defined?(::Rails)
+
+    @server = Server.new(application, logger: logger)
+    @server.start
   end
 
-  def self.enable!
-    server.start
+  def self.server
+    @server
+  end
+
+  def self.server?
+    !!@server
   end
 end

data/lib/calliper/page.rb

@@ -8,11 +8,11 @@ module Calliper
       page
     end
 
-    def get(path, sync: true)
+    def get(path, options = {})
       url = path =~ %r(^http://) ? path : "#{base_url}#{path}"
       driver.get(url)
 
-      if sync
+      if options[:sync].nil? || options[:sync]
         wait = Selenium::WebDriver::Wait.new(timeout: 10)
         wait.until { driver.find_element(css: "[ng-app]") }
       end

data/lib/calliper/server.rb

@@ -1,23 +1,16 @@
+require 'timeout'
 require 'calliper/config'
 
 module Calliper
-  def self.server
-    @server ||= Server.new(Config.application)
-  end
-
-  def self.server?
-    !!@server
-  end
-
   # NOTE: Borrows code from the fantastic Teaspoon gem:
   #   http://github.com/modeset/teaspoon
   class Server
     attr_reader :application, :port, :logger
 
-    def initialize(application, port = Config.port, logger = nil)
+    def initialize(application, options = {})
       @application = application
-      @port = port
-      @logger = logger
+      @port = options[:port] || Config.port || find_available_port
+      @logger = options[:logger]
     end
 
     def start
@@ -56,5 +49,14 @@ module Calliper
     def url
       "http://127.0.0.1:#{port}"
     end
+
+    private
+
+      def find_available_port
+        server = TCPServer.new('127.0.0.1', 0)
+        server.addr[1]
+      ensure
+        server.close if server
+      end
   end
 end

data/lib/calliper/webdriver.rb

@@ -1,8 +1,8 @@
 require 'socket'
 
 module Calliper
-  # TODO: connect to any remote server (eg: custom, saucelabs, browserstack)
-  # FIXME: only firefox quits correctly when used directly
+  # FIXME: Only firefox quits correctly when used directly. There are no
+  #   problems when using a Selenium Server.
   def self.driver
     @driver ||= if local_server_running?
                   Selenium::WebDriver.for(:remote,
@@ -15,7 +15,7 @@ module Calliper
                     desired_capabilities: Config.capabilities
                   )
                 else
-                  Selenium::WebDriver.for(Config.driver)
+                  Selenium::WebDriver.for(Config.driver ? Config.driver.to_sym : :firefox)
                 end
   end
 
@@ -39,7 +39,7 @@ end
 # FIXME: use real locators that use protractor's client-side finders:
 #   https://github.com/angular/protractor/blob/master/lib/clientsidescripts.js
 module Selenium::WebDriver::SearchContext
-  %i(find_element find_elements).each do |name|
+  %w(find_element find_elements).each do |name|
     alias_method "#{name}_without_angular", name
 
     define_method name do |*args|

data/test/test_helper.rb

@@ -5,7 +5,6 @@ require_relative 'sample/application'
 
 Calliper.setup do |config|
   config.application = SampleApplication
-  config.port = 3002
 
   if ENV['CI']
     config.driver = :remote

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calliper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Julien Portalier
@@ -47,7 +47,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rake
+  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: json
+  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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -93,8 +121,6 @@ files:
 - lib/calliper/config.rb
 - lib/calliper/minitest.rb
 - lib/calliper/page.rb
-- lib/calliper/rack.rb
-- lib/calliper/rails.rb
 - lib/calliper/server.rb
 - lib/calliper/version.rb
 - lib/calliper/webdriver.rb

data/lib/calliper/rack.rb

@@ -1,19 +0,0 @@
-require 'calliper/server'
-
-module Calliper
-  def self.application
-    @app
-  end
-
-  def self.application=(app)
-    @app = app
-  end
-
-  def self.server
-    @server ||= Server.new(application)
-  end
-
-  def self.server?
-    !!@server
-  end
-end

data/lib/calliper/rails.rb

@@ -1,2 +0,0 @@
-require 'calliper/server'
-Calliper::Config.application = Rails.application