jasmine_selenium_runner 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94aa68074fa6bd922eae4c54c51337a27881b366
-  data.tar.gz: ffff97516d2a1241a7c2fa7f08fdc79d12683d3f
+  metadata.gz: 71c49524cded239d450de93167e2e595e783d265
+  data.tar.gz: 61c45501e41dbda1c35b7fbc8f07f881c6a956c1
 SHA512:
-  metadata.gz: 57a3598792a25d6c482f9630804ef8884a36cac9c7f8a1e576bd75f17df9b216bfadb96756c7f8cbb725d6c120a27ef8623aa918bc99c1bf9e3746d003933ccf
-  data.tar.gz: 222a273ad1d72480624e3676af3b256c8586c2e20f7aef078be1f6fccb4a069adb9d4746eb49e637680ece9890bd0f10fd1dd68e58ac5488ae20b2774dd7fd66
+  metadata.gz: f5e1c6a43f07697730c1309809aca6da84d9552df5e9224a6251ef1c86d3d0625a1b75b428ace67a64b7379708ed1c6258fd21869b4f846f41a343f250fd2b2b
+  data.tar.gz: 314d392cdc9071ceab94f0a5c5ef02769d1dc52ac40640f6f30ff450ccdc853f33caf0511f066cce74d725cf188c57d95bd5ff53ffe554ee918e5ecbd2ae8698

data/.travis.yml

@@ -1,6 +1,6 @@
 before_script:
 - sh -e /etc/init.d/xvfb start
-- curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
+- curl -L https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
 script: DISPLAY=:99.0 bundle exec rake
 rvm:
 - 2.0.0

data/jasmine-selenium-runner.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'rails', '> 3.0'
   spec.add_dependency 'jasmine', '~> 2.0.0.alpha'
   spec.add_dependency 'selenium-webdriver', '~> 2.35'
   spec.add_dependency 'sauce-connect'

data/lib/jasmine/runners/selenium.rb

@@ -52,14 +52,32 @@ module Jasmine
         spec_results = []
 
         loop do
-          slice = driver.execute_script("return jsApiReporter.specResults(#{index}, #{result_batch_size})")
-          spec_results << Jasmine::Result.map_raw_results(slice)
+          slice = results_without_circular_references(index)
+          spec_results << slice
           index += result_batch_size
           break if slice.size < result_batch_size
         end
         spec_results.flatten
       end
 
+      def results_without_circular_references(starting_index)
+        slice = driver.execute_script(<<-JS)
+          var specResults = jsApiReporter.specResults(#{starting_index}, #{result_batch_size})
+          for (var i = 0; i < specResults.length; i++) {
+            var expectations = specResults[i].failedExpectations;
+            if (specResults[i].passedExpectations) {
+              expectations = expectations.concat(specResults[i].passedExpectations);
+            }
+            for (var j = 0; j < expectations.length; j++) {
+              var expectation = expectations[j];
+              try { JSON.stringify(expectation.expected); } catch (e) { expectation.expected = '<circular expected>'; }
+              try { JSON.stringify(expectation.actual); } catch (e) { expectation.actual = '<circular actual>'; }
+            }
+          }
+          return specResults;
+        JS
+        Jasmine::Result.map_raw_results(slice)
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Jasmine
   module Runners
     class Selenium
-      VERSION = "0.1.1"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/jasmine_selenium_runner/configure_jasmine.rb

@@ -21,7 +21,9 @@ module JasmineSeleniumRunner
     end
 
     def self.load_config
-      filepath = File.join(Dir.pwd, 'spec', 'javascripts', 'support', 'jasmine_selenium_runner.yml')
+      filepath = ENV['JASMINE_SELENIUM_CONFIG_PATH']
+      filepath ||= File.join(Dir.pwd, 'spec', 'javascripts', 'support', 'jasmine_selenium_runner.yml')
+
       if File.exist?(filepath)
         YAML::load(ERB.new(File.read(filepath)).result(binding))
       else

data/lib/jasmine_selenium_runner/tasks/jasmine_selenium_runner.rake

@@ -5,4 +5,4 @@ namespace :jasmine_selenium_runner do
   end
 end
 
-task 'jasmine:require' => ['jasmine_selenium_runner:setup']
+task 'jasmine:configure_plugins' => ['jasmine_selenium_runner:setup']

data/spec/fixtures/contains_circular_references_spec.js

@@ -0,0 +1,7 @@
+it("handles circular references", function() {
+  var objA = {};
+  var objB = {back_reference: objA};
+  objA.back_reference = objB;
+
+  expect(objA).not.toBe(objA);
+});

data/spec/jasmine_selenium_runner/configure_jasmine_spec.rb

@@ -10,7 +10,7 @@ describe "Configuring jasmine" do
     let(:config) { { 'selenium_server' => 'http://example.com/selenium/stuff' }}
 
     it "make a webdriver pointing to the custom server" do
-      Selenium::WebDriver.should_receive(:for).with(:remote, hash_including(url: 'http://example.com/selenium/stuff'))
+      expect(Selenium::WebDriver).to receive(:for).with(:remote, hash_including(url: 'http://example.com/selenium/stuff'))
       configurer.make_runner
     end
   end
@@ -20,8 +20,8 @@ describe "Configuring jasmine" do
 
     it "should create a firebug profile and pass that to WebDriver" do
       profile = double(:profile, enable_firebug: nil)
-      Selenium::WebDriver::Firefox::Profile.stub(:new).and_return(profile)
-      Selenium::WebDriver.should_receive(:for).with('firefox-firebug'.to_sym, {profile: profile})
+      allow(Selenium::WebDriver::Firefox::Profile).to receive(:new).and_return(profile)
+      expect(Selenium::WebDriver).to receive(:for).with('firefox-firebug'.to_sym, {profile: profile})
       configurer.make_runner
     end
   end
@@ -32,17 +32,17 @@ describe "Configuring jasmine" do
     end
 
     def configure
-      Dir.stub(:pwd).and_return(working_dir)
-      Jasmine.stub(:configure).and_yield(fake_config)
+      allow(Dir).to receive(:pwd).and_return(working_dir)
+      allow(Jasmine).to receive(:configure).and_yield(fake_config)
       JasmineSeleniumRunner::ConfigureJasmine.install_selenium_runner
     end
 
-    def stub_config_file(config_obj)
-      config_path = File.join(working_dir, 'spec', 'javascripts', 'support', 'jasmine_selenium_runner.yml')
-      File.stub(:exist?).and_call_original
-      File.stub(:exist?).with(config_path).and_return(true)
-      File.stub(:read).and_call_original
-      File.stub(:read).with(config_path).and_return(YAML.dump(config_obj))
+    def stub_config_file(config_obj, config_path=nil)
+      config_path ||= File.join(working_dir, 'spec', 'javascripts', 'support', 'jasmine_selenium_runner.yml')
+      allow(File).to receive(:exist?).and_call_original
+      allow(File).to receive(:exist?).with(config_path).and_return(true)
+      allow(File).to receive(:read).and_call_original
+      allow(File).to receive(:read).with(config_path).and_return(YAML.dump(config_obj))
     end
 
     let(:working_dir) { 'hi' }
@@ -58,15 +58,35 @@ describe "Configuring jasmine" do
       end
     end
 
-    before do
-      stub_config_file 'configuration_class' => 'Foo::Bar'
-      configure
+    context 'with the default config file location' do
+      before do
+        stub_config_file 'configuration_class' => 'Foo::Bar'
+        configure
+      end
+
+      it "should use the custom class" do
+        expect(Selenium::WebDriver).not_to receive(:for)
+        expect_any_instance_of(Foo::Bar).to receive(:make_runner)
+        fake_config.runner.call(nil, nil)
+      end
     end
 
-    it "should use the custom class" do
-      Selenium::WebDriver.should_not_receive(:for)
-      Foo::Bar.any_instance.should_receive(:make_runner)
-      fake_config.runner.call(nil, nil)
+    context 'with a custom config file path' do
+      before do
+        stub_config_file({ 'configuration_class' => 'Foo::Bar' }, '/tmp/config.yml')
+        ENV['JASMINE_SELENIUM_CONFIG_PATH'] = '/tmp/config.yml'
+        configure
+      end
+
+      after do
+        ENV.delete 'JASMINE_SELENIUM_CONFIG_PATH'
+      end
+
+      it "should use the custom class" do
+        expect(Selenium::WebDriver).not_to receive(:for)
+        expect_any_instance_of(Foo::Bar).to receive(:make_runner)
+        fake_config.runner.call(nil, nil)
+      end
     end
   end
 end

data/spec/selenium_runner_integration_spec.rb

@@ -21,7 +21,27 @@ GEMFILE
         `bundle exec jasmine examples`
         FileUtils.cp(File.join(project_root, 'spec', 'fixtures', 'is_in_firefox_spec.js'), File.join(dir, 'spec', 'javascripts'))
         ci_output = `bundle exec rake -E "require 'jasmine_selenium_runner'" --trace jasmine:ci`
-        ci_output.should =~ /[1-9][0-9]* specs, 0 failures/
+        expect(ci_output).to match(/[1-9][0-9]* specs, 0 failures/)
+      end
+    end
+  end
+
+  it "allows rake jasmine:ci to retrieve results even though Selenium can't transmit back circular JS objects" 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'
+GEMFILE
+      end
+      Bundler.with_clean_env do
+        `bundle`
+        `bundle exec jasmine init`
+        `bundle exec jasmine examples`
+        FileUtils.cp(File.join(project_root, 'spec', 'fixtures', 'contains_circular_references_spec.js'), File.join(dir, 'spec', 'javascripts'))
+        ci_output = `bundle exec rake -E "require 'jasmine_selenium_runner'" --trace jasmine:ci`
+        expect(ci_output).to match(/[1-9][0-9]* specs, 1 failure/)
       end
     end
   end
@@ -68,13 +88,13 @@ YAML
         before = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(job_list_request)
         end
-        JSON.parse(before.body).should == []
+        expect(JSON.parse(before.body)).to be_empty
         ci_output = %x{bundle exec rake -E "require 'jasmine_selenium_runner'" --trace jasmine:ci}
-        ci_output.should =~ (/[1-9][0-9]* specs, 0 failures/)
+        expect(ci_output).to match(/[1-9][0-9]* specs, 0 failures/)
         after = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(job_list_request)
         end
-        JSON.parse(after.body).should_not be_empty
+        expect(JSON.parse(after.body)).not_to be_empty
       end
     end
   end
@@ -107,7 +127,7 @@ YAML
         `bundle exec rails g jasmine:examples`
         FileUtils.cp(File.join(project_root, 'spec', 'fixtures', 'is_in_firefox_spec.js'), File.join(dir, 'rails-test', 'spec', 'javascripts'))
         output = `bundle exec rake jasmine:ci`
-        output.should =~ /[1-9]\d* specs, 0 failures/
+        expect(output).to match(/[1-9]\d* specs, 0 failures/)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine_selenium_runner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !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
@@ -57,16 +57,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - lib/jasmine_selenium_runner/firebug/firebug.rb
 - lib/jasmine_selenium_runner/railtie.rb
 - lib/jasmine_selenium_runner/tasks/jasmine_selenium_runner.rake
+- spec/fixtures/contains_circular_references_spec.js
 - spec/fixtures/is_in_firefox_spec.js
 - spec/fixtures/is_in_ie_spec.js
 - spec/jasmine_selenium_runner/configure_jasmine_spec.rb
@@ -159,11 +160,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Run your jasmine tests in a real live browser!
 test_files:
+- spec/fixtures/contains_circular_references_spec.js
 - spec/fixtures/is_in_firefox_spec.js
 - spec/fixtures/is_in_ie_spec.js
 - spec/jasmine_selenium_runner/configure_jasmine_spec.rb