diff --git a/.travis.yml b/.travis.yml index 2b99e136..85b77b4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,3 +7,9 @@ script: "DISPLAY=:99.0 bundle exec rake core_spec" rvm: - "1.9.3" + +env: + - JASMINE_BROWSER=firefox + - JASMINE_BROWSER=chrome + - JASMINE_BROWSER=safari + - JASMINE_BROWSER=phantomjs diff --git a/Gemfile b/Gemfile index 35234e00..eb46cade 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' gem "rake" -gem "jasmine", :git => 'https://github.com/pivotal/jasmine-gem.git', :branch => '2_0' +gem "jasmine", :git => 'https://github.com/pivotal/jasmine-gem.git' #gem "jasmine", path: "/Users/pivotal/workspace/jasmine-gem" unless ENV["TRAVIS"] group :debug do diff --git a/spec/jasmine_self_test_spec.rb b/spec/jasmine_self_test_spec.rb index a1699b5c..4c1594da 100644 --- a/spec/jasmine_self_test_spec.rb +++ b/spec/jasmine_self_test_spec.rb @@ -4,6 +4,9 @@ require 'jasmine' Jasmine.load_configuration_from_yaml(File.join(Dir.pwd, 'spec', 'jasmine.yml')) config = Jasmine.config +Jasmine.configure do |config| + config.browser = ENV.fetch('JASMINE_BROWSER', 'firefox') +end server = Jasmine::Server.new(config.port, Jasmine::Application.app(config)) driver = Jasmine::SeleniumDriver.new(config.browser, "#{config.host}:#{config.port}/") @@ -18,7 +21,7 @@ t.abort_on_exception = true Jasmine::wait_for_listener(config.port, "jasmine server") puts "jasmine server started." -reporter = Jasmine::Runners::ApiReporter.new(driver, config.result_batch_size) +reporter = Jasmine::Reporters::ApiReporter.new(driver, config.result_batch_size) raw_results = Jasmine::Runners::HTTP.new(driver, reporter).run results = Jasmine::Results.new(raw_results)