jasmine 0.10.3.4 → 0.10.3.5

data/generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml

@@ -1,4 +1,15 @@
-#  Return an array of filepaths relative to src_dir to include before jasmine specs.
+# src_files
+#
+# Return an array of filepaths relative to src_dir to include before jasmine specs.
+# Default: []
+#
+# EXAMPLE:
+#
+# src_files:
+#   - lib/source1.js
+#   - lib/source2.js
+#   - dist/**/*.js
+#
 src_files:
   - public/javascripts/prototype.js
   - public/javascripts/effects.js
@@ -6,20 +17,64 @@ src_files:
   - public/javascripts/dragdrop.js
   - public/javascripts/application.js
 
-#  Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
+# stylesheets
+#
+# Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
+# Default: []
+#
+# EXAMPLE:
+#
+# stylesheets:
+#   - css/style.css
+#   - stylesheets/*.css
+#
 stylesheets:
   - stylesheets/**/*.css
 
-#  Return an array of filepaths relative to spec_dir to include before jasmine specs.
+# helpers
+#
+# Return an array of filepaths relative to spec_dir to include before jasmine specs.
+# Default: ["helpers/**/*.js"]
+#
+# EXAMPLE:
+#
+# helpers:
+#   - helpers/**/*.js
+#
 helpers:
   - helpers/**/*.js
 
-#  Return an array of filepaths relative to spec_dir to include
+# spec_files
+#
+# Return an array of filepaths relative to spec_dir to include.
+# Default: ["**/*[sS]pec.js"]
+#
+# EXAMPLE:
+#
+# spec_files:
+#   - **/*[sS]pec.js
+#
 spec_files:
   - **/*[sS]pec.js
 
-#  Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
+# src_dir
+#
+# Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
+# Default: project root
+#
+# EXAMPLE:
+#
+# src_dir: public
+#
 src_dir:
 
-#  Spec directory path. Your spec_files must be returned relative to this path.
+# spec_dir
+#
+# Spec directory path. Your spec_files must be returned relative to this path.
+# Default: spec/javascripts
+#
+# EXAMPLE:
+#
+# spec_dir: spec/javascripts
+#
 spec_dir: spec/javascripts

data/generators/jasmine/templates/spec/javascripts/support/jasmine.yml

@@ -1,24 +1,72 @@
-#  Return an array of filepaths relative to src_dir to include before jasmine specs.
-#src_files:
-#  - lib/source1.js
-#  - lib/source2.js
-#  - dist/**/*.js
+# src_files
+#
+# Return an array of filepaths relative to src_dir to include before jasmine specs.
+# Default: []
+#
+# EXAMPLE:
+#
+# src_files:
+#   - lib/source1.js
+#   - lib/source2.js
+#   - dist/**/*.js
+#
+src_files:
 
-#  Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
-#stylesheets:
-#  - css/style.css
-#  - stylesheets/*.css
+# stylesheets
+#
+# Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
+# Default: []
+#
+# EXAMPLE:
+#
+# stylesheets:
+#   - css/style.css
+#   - stylesheets/*.css
+#
+stylesheets:
 
-#  Return an array of filepaths relative to spec_dir to include before jasmine specs.
-#helpers:
-#  - helpers/**/*.js
+# helpers
+#
+# Return an array of filepaths relative to spec_dir to include before jasmine specs.
+# Default: ["helpers/**/*.js"]
+#
+# EXAMPLE:
+#
+# helpers:
+#   - helpers/**/*.js
+#
+helpers:
 
+# spec_files
+#
 #  Return an array of filepaths relative to spec_dir to include.
-#spec_files:
-#  - **/*[sS]pec.js
+# Default: ["**/*[sS]pec.js"]
+#
+# EXAMPLE:
+#
+# spec_files:
+#   - **/*[sS]pec.js
+#
+spec_files:
 
-#  Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
-#src_dir:
+# src_dir
+#
+# Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
+# Default: project root
+#
+# EXAMPLE:
+#
+# src_dir: public
+#
+src_dir:
 
-#  Spec directory path. Your spec_files must be returned relative to this path.
-#spec_dir: spec/javascripts
+# spec_dir
+#
+# Spec directory path. Your spec_files must be returned relative to this path.
+# Default: spec/javascripts
+#
+# EXAMPLE:
+#
+# spec_dir: spec/javascripts
+#
+spec_dir:

data/lib/jasmine/config.rb

@@ -14,7 +14,7 @@ module Jasmine
 
     def start_server(port = 8888)
       handler = Rack::Handler.default
-      handler.run Jasmine.app(self), :Port => port
+      handler.run Jasmine.app(self), :Port => port, :AccessLog => []
     end
 
     def start
@@ -68,7 +68,13 @@ module Jasmine
     def stop_servers
       puts "shutting down the servers..."
       Jasmine::kill_process_group(@selenium_pid) if @selenium_pid
-      Jasmine::kill_process_group(@jasmine_server_pid) if @jasmine_server_pid
+      if @jasmine_server_pid
+        if Rack::Handler.default == Rack::Handler::WEBrick
+          Jasmine::kill_process_group(@jasmine_server_pid, "INT")
+        else
+          Jasmine::kill_process_group(@jasmine_server_pid)
+        end
+      end
     end
 
     def run

data/spec/config_spec.rb

@@ -238,5 +238,23 @@ describe Jasmine::Config do
     end
   end
 
-
+  describe "#stop_servers" do
+    it "should kill Selenium and Rack servers" do
+      Rack::Handler.stub!(:default).and_return("Not WEBrick")
+      config = Jasmine::Config.new
+      config.instance_variable_set(:@selenium_pid, 100)
+      config.instance_variable_set(:@jasmine_server_pid, 200)
+      Jasmine.should_receive(:kill_process_group).with(100)
+      Jasmine.should_receive(:kill_process_group).with(200)
+      config.stop_servers
+    end
+    
+    it "should send kill with SIGINT to WEBrick" do
+      Rack::Handler.stub!(:default).and_return(Rack::Handler::WEBrick)
+      config = Jasmine::Config.new
+      config.instance_variable_set(:@jasmine_server_pid, 100)
+      Jasmine.should_receive(:kill_process_group).with(100, "INT")
+      config.stop_servers
+    end
+  end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 10
   - 3
-  - 4
-  version: 0.10.3.4
+  - 5
+  version: 0.10.3.5
 platform: ruby
 authors: 
 - Rajan Agaskar
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -07:00
+date: 2010-04-27 00:00:00 -07:00
 default_executable: jasmine
 dependencies: 
 - !ruby/object:Gem::Dependency