jasmine_selenium_runner 0.2.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c72efde02f61e3edfbd9b908dbc9b61bf7d31ea
-  data.tar.gz: cb60cac460be62c9563be2ab87ab802393a42788
+  metadata.gz: 5b016f1e9bd01f01d14e6980aa2d6f986a09f567
+  data.tar.gz: 3f0debf2199c0051f7fdaa1735f7956d7b5f649c
 SHA512:
-  metadata.gz: f119b0c6d31d03918b9bc59a6e6c037dac94ee4732d80c4a4d4c80d84b243f0fcf6a51190d6636006ad18e01bfd688dfeab30ecf13219be6696312a4845bf9cd
-  data.tar.gz: de2708d84c3159b4362e3d6a883e39e99933ca6fd86a6daa175f7d79c7fe631a4d70c426e8b7163b7f1ae896f99347569d12c06501c4c3e2904844167c28fc93
+  metadata.gz: 0594693f2e44acc5f1b375a599d264fd014a34ad1311890856ffddfff123cadb4ec18d6387c4022ee5db5ede5fc5ad736a4976d4c368d8fb4728a613d5c46215
+  data.tar.gz: 43f7235d4cbec6f8dfac4218e0811550eb0dcfd69ea186554ef08e8fb6173ef81c472f0afa70e90de952fc47b744e8516f9bfaeb2a64a560be35da0f53618de1

data/.rspec

@@ -1 +1,2 @@
 --color
+--order=random

data/.travis.yml

@@ -1,9 +1,10 @@
 before_script:
 - sh -e /etc/init.d/xvfb start
-- curl -L https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
 script: DISPLAY=:99.0 bundle exec rake
+addons:
+  sauce_connect: true
 rvm:
-- 2.0.0
+- 2.1.0
 env:
   global:
   - secure: i8arxYVwMt/vp8a5RugpE+edkCg1G+wQ1WdCbdiKPhDZEcMh6f9vETvcsY9W94xY7yTBNSrZ+jNkz5ZQrGfiq1HllKxSjZBXv0pJ+wyxuFHl7hSib1OCzEImk0lHVryX7A7iO4u1GzZ+jmiVyKL7uEjD6CokphOpwnYpBln8jlg=

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'jasmine', :git => 'https://github.com/pivotal/jasmine-gem.git'
+gem 'jasmine', :git => 'https://github.com/jasmine/jasmine-gem.git'
+gem 'jasmine-core', :git => 'https://github.com/jasmine/jasmine.git'
 

data/README.md

@@ -86,6 +86,18 @@ which you'll want for SAUCE_USERNAME and SAUCE_ACCESS_KEY):
         - SAUCE_OS="Linux"
         - SAUCE_BROWSER_VERSION=''
 
+### Using with sauce connect locally
+
+Sauce connect 4 now requires a path to the `sc` executable, so that needs to be provided if you want to use SauceLabs without a pre-existing tunnel.
+In your jasmine_selenium_runner.yml, in the sauce section, you need to provide a `sauce_connect_path`.
+
+    ---
+    use_sauce: true
+    sauce:
+      sauce_connect_path: /my/path/to/sc
+
+This configuration will only be used if no `tunnel_identifier` is provided.
+
 ### Using with a custom selenium server
 
 Create a jasmine_selenium_runner.yml in spec/javascripts/support/ with the following content:

data/lib/jasmine/runners/selenium.rb

@@ -16,7 +16,7 @@ module Jasmine
         wait_for_suites_to_finish_running
 
         formatter.format(get_results)
-        formatter.done
+        formatter.done(run_details)
       ensure
         driver.quit
       end
@@ -32,6 +32,10 @@ module Jasmine
         driver.execute_script "return jsApiReporter && jsApiReporter.finished"
       end
 
+      def run_details
+        driver.execute_script "return jsApiReporter && jsApiReporter.runDetails"
+      end
+
       def ensure_connection_established
         started = Time.now
         until started? do

data/lib/jasmine/runners/selenium/version.rb

@@ -1,7 +1,7 @@
 module Jasmine
   module Runners
     class Selenium
-      VERSION = "0.2.1"
+      VERSION = "2.4.0"
     end
   end
 end

data/lib/jasmine_selenium_runner/configure_jasmine.rb

@@ -1,5 +1,6 @@
 require 'jasmine'
 require 'jasmine/runners/selenium'
+require 'jasmine_selenium_runner/sauce_connect_configurer'
 require 'selenium-webdriver'
 
 module JasmineSeleniumRunner
@@ -57,8 +58,9 @@ module JasmineSeleniumRunner
 
     def sauce_webdriver(sauce_config)
       unless sauce_config['tunnel_identifier']
-        require 'sauce/connect'
-        Sauce::Connect.connect!
+        SauceConnectConfigurer.configure do |config|
+          config[:sauce_connect_4_executable] = sauce_config.fetch('sauce_connect_path')
+        end
       end
 
       username = sauce_config.fetch('username')

data/lib/jasmine_selenium_runner/sauce_connect_configurer.rb

@@ -0,0 +1,12 @@
+module JasmineSeleniumRunner
+  module SauceConnectConfigurer
+    def self.configure
+      require 'sauce'
+      require 'sauce/connect'
+      Sauce.config do |config|
+        yield config
+      end
+      Sauce::Connect.connect!
+    end
+  end
+end

data/release_notes/2.4.0.md

@@ -0,0 +1,11 @@
+# Jasmine Selenium Runner 2.4.0 Release Notes
+
+## Changes
+
+* Support reporting for randomized runs
+* Document how to use with sauce connect
+* Support sauce connect 4
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

data/spec/jasmine_selenium_runner/configure_jasmine_spec.rb

@@ -89,4 +89,88 @@ describe "Configuring jasmine" do
       end
     end
   end
+
+  context 'configuring sauce labs' do
+    before do
+      allow(Selenium::WebDriver).to receive(:for) { mock_driver }
+      allow(Jasmine::Runners::Selenium).to receive(:new)
+      allow(JasmineSeleniumRunner::SauceConnectConfigurer).to receive(:configure).and_yield(sauce_config)
+    end
+
+    let(:sauce_thing) { double(:sauce_thing) }
+    let(:mock_driver) { double(:mock_driver) }
+    let(:sauce_config) { double(:sauce_config, :[]= => nil) }
+
+    context 'with an existing tunnel' do
+      it 'uses the tunnel identifier' do
+        runner = JasmineSeleniumRunner::ConfigureJasmine.new(double(:formatter), 'jasmine_url', {
+          'use_sauce' => true,
+          'sauce' => {
+            'username' => 'sauce_user',
+            'access_key' => 'sauce_key',
+            'name' => 'sauce_name',
+            'os' => 'sauce_os',
+            'browser_version' => 'browser_version',
+            'build' => 'build',
+            'tags' => 'tags',
+            'tunnel_identifier' => 'tunnel'
+          }
+        }) do |thing|
+
+        end
+
+        runner.make_runner
+
+        expect(JasmineSeleniumRunner::SauceConnectConfigurer).not_to have_received(:configure)
+        expect(Selenium::WebDriver).to have_received(:for).with(:remote,
+                                                                :url => 'http://sauce_user:sauce_key@localhost:4445/wd/hub',
+                                                                :desired_capabilities => {
+                                                                  :name => 'sauce_name',
+                                                                  :platform => 'sauce_os',
+                                                                  :version => 'browser_version',
+                                                                  :build => 'build',
+                                                                  :tags => 'tags',
+                                                                  :browserName => 'firefox',
+                                                                  'tunnel-identifier' => 'tunnel'
+                                                                }
+                                                               )
+      end
+    end
+
+    context 'without an existing tunnel' do
+      it 'uses sauce connect' do
+        runner = JasmineSeleniumRunner::ConfigureJasmine.new(double(:formatter), 'jasmine_url', {
+          'use_sauce' => true,
+          'sauce' => {
+            'username' => 'sauce_user',
+            'access_key' => 'sauce_key',
+            'name' => 'sauce_name',
+            'os' => 'sauce_os',
+            'browser_version' => 'browser_version',
+            'build' => 'build',
+            'tags' => 'tags',
+            'sauce_connect_path' => '/path/to/sc'
+          }
+        })
+
+
+        runner.make_runner
+
+        expect(JasmineSeleniumRunner::SauceConnectConfigurer).to have_received(:configure)
+        expect(sauce_config).to have_received(:[]=).with(:sauce_connect_4_executable, '/path/to/sc')
+        expect(Selenium::WebDriver).to have_received(:for).with(:remote,
+                                                                :url => 'http://sauce_user:sauce_key@localhost:4445/wd/hub',
+                                                                :desired_capabilities => {
+                                                                  :name => 'sauce_name',
+                                                                  :platform => 'sauce_os',
+                                                                  :version => 'browser_version',
+                                                                  :build => 'build',
+                                                                  :tags => 'tags',
+                                                                  :browserName => 'firefox',
+                                                                  'tunnel-identifier' => nil
+                                                                }
+                                                               )
+      end
+    end
+  end
 end

data/spec/selenium_runner_integration_spec.rb

@@ -3,6 +3,7 @@ require 'tmpdir'
 require 'jasmine'
 require 'json'
 require 'net/http'
+require 'bundler'
 
 describe Jasmine::Runners::Selenium do
   let(:file_helper) { FileHelper.new }
@@ -70,6 +71,33 @@ GEMFILE
     end
   end
 
+  it "reports random jasmine runs" do
+    in_temp_dir do |dir, project_root|
+      File.open(File.join(dir, 'Gemfile'), 'w') do |file|
+        file.write <<-GEMFILE
+source 'https://rubygems.org'
+gem 'jasmine_selenium_runner', :path => '#{project_root}'
+gem 'jasmine', :git => 'https://github.com/pivotal/jasmine-gem.git'
+gem 'jasmine-core', :git => 'https://github.com/pivotal/jasmine.git'
+GEMFILE
+      end
+      Bundler.with_clean_env do
+        `bundle`
+        `bundle exec jasmine init`
+        `bundle exec jasmine examples`
+        yaml_file = File.join(dir, 'spec', 'javascripts', 'support', 'jasmine.yml')
+        jasmine_yaml = YAML.load_file(yaml_file)
+        jasmine_yaml['random'] = true
+        File.open(yaml_file, 'w') do |file|
+          file.write(YAML.dump(jasmine_yaml))
+          file.flush
+        end
+        ci_output = `bundle exec rake -E "require 'jasmine_selenium_runner'" --trace jasmine:ci`
+        expect(ci_output).to match(/Randomized with seed/)
+      end
+    end
+  end
+
   it "permits rake jasmine:ci task to be run using Sauce", :sauce => true do
     in_temp_dir do |dir, project_root|
       File.open(File.join(dir, 'Gemfile'), 'w') do |file|
@@ -99,6 +127,7 @@ sauce:
     - #{ENV['TRAVIS_RUBY_VERSION'] || RUBY_VERSION}
     - CI
   tunnel_identifier: #{ENV['TRAVIS_JOB_NUMBER'] ? %Q("#{ENV['TRAVIS_JOB_NUMBER']}") : nil}
+  sauce_connect_path: #{ENV['SAUCE_CONNECT_PATH']}
   os: "Windows 8"
   browser_version: 10
 YAML

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'jasmine_selenium_runner'
 RSpec.configure do |config|
   config.before(:each, :sauce => true) do
     unless ENV["SAUCE_USERNAME"] && ENV["SAUCE_ACCESS_KEY"]
-      pending "skipping sauce tests because SAUCE_USERNAME and SAUCE_ACCESS_KEY aren't set"
+      skip "skipping sauce tests because SAUCE_USERNAME and SAUCE_ACCESS_KEY aren't set"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine_selenium_runner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   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: 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: rspec
   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: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.35'
 - !ruby/object:Gem::Dependency
   name: sauce-connect
   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'
 description: Run your jasmine tests in a real live browser!
@@ -117,9 +117,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -133,7 +133,9 @@ files:
 - lib/jasmine_selenium_runner/firebug/firebug-license.txt
 - lib/jasmine_selenium_runner/firebug/firebug.rb
 - lib/jasmine_selenium_runner/railtie.rb
+- lib/jasmine_selenium_runner/sauce_connect_configurer.rb
 - lib/jasmine_selenium_runner/tasks/jasmine_selenium_runner.rake
+- release_notes/2.4.0.md
 - spec/fixtures/after_all_failure_spec.js
 - spec/fixtures/contains_circular_references_spec.js
 - spec/fixtures/is_in_firefox_spec.js
@@ -151,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Run your jasmine tests in a real live browser!