lib/guard/jasmine.rb in guard-jasmine-1.9.3 vs lib/guard/jasmine.rb in guard-jasmine-1.9.4

- old
+ new

@@ -25,11 +25,11 @@ :server_env => ENV['RAILS_ENV'] || 'development', :server_timeout => 15, :port => 8888, :rackup_config => nil, :jasmine_url => 'http://localhost:8888/jasmine', - :timeout => 10000, + :timeout => 10, :spec_dir => 'spec/javascripts', :notification => true, :hide_success => false, :all_on_start => true, :keep_failed => true, @@ -51,10 +51,10 @@ # @option options [Integer] :server_timeout the number of seconds to wait for the Jasmine spec server # @option options [String] :port the port for the Jasmine test server # @option options [String] :rackup_config custom rackup config to use # @option options [String] :jasmine_url the url of the Jasmine test runner # @option options [String] :phantomjs_bin the location of the PhantomJS binary - # @option options [Integer] :timeout the maximum time in milliseconds to wait for the spec runner to finish + # @option options [Integer] :timeout the maximum time in seconds to wait for the spec runner to finish # @option options [String] :spec_dir the directory with the Jasmine specs # @option options [Boolean] :notification show notifications # @option options [Boolean] :hide_success hide success message notification # @option options [Integer] :max_error_notify maximum error notifications to show # @option options [Boolean] :all_on_start run all suites on start