lib/guard/jasmine.rb in guard-jasmine-1.16.0 vs lib/guard/jasmine.rb in guard-jasmine-1.17.0
- old
+ new
@@ -23,10 +23,11 @@
DEFAULT_OPTIONS = {
server: :auto,
server_env: ENV['RAILS_ENV'] || 'development',
server_timeout: 60,
+ server_mount: '/jasmine',
port: nil,
rackup_config: nil,
jasmine_url: nil,
timeout: 60,
spec_dir: nil,
@@ -89,10 +90,10 @@
options[:spec_dir] ||= File.exists?(File.join('spec', 'javascripts')) ? File.join('spec', 'javascripts') : 'spec'
options[:port] ||= Jasmine.find_free_server_port
options[:server] ||= :auto
options[:server] = ::Guard::Jasmine::Server.detect_server(options[:spec_dir]) if options[:server] == :auto
- options[:jasmine_url] = "http://localhost:#{ options[:port] }#{ options[:server] == :jasmine_gem ? '/' : '/jasmine' }" unless options[:jasmine_url]
+ options[:jasmine_url] = "http://localhost:#{ options[:port] }#{ options[:server] == :jasmine_gem ? '/' : options[:server_mount] }" unless options[:jasmine_url]
options[:specdoc] = :failure if ![:always, :never, :failure].include? options[:specdoc]
options[:phantomjs_bin] = Jasmine.which('phantomjs') unless options[:phantomjs_bin]
self.run_all_options = options.delete(:run_all) || { }