jasmine 0.10.2.0 → 0.10.2.1

data/lib/jasmine/config.rb

@@ -113,6 +113,10 @@ module Jasmine
       src_files.collect {|f| "/" + f } + spec_files.collect {|f| File.join(spec_path, f) }
     end
 
+    def focused_files(spec_filter)
+      src_files.collect {|f| "/" + f } + match_files(spec_dir, spec_filter).collect {|f| File.join(spec_path, f) }
+    end
+
     def css_files
       stylesheets.collect {|f| "/" + f }
     end

data/lib/jasmine/server.rb

@@ -13,24 +13,23 @@ module Jasmine
 
     def call(env)
       return not_found if env["PATH_INFO"] != "/"
-      return [200,{ 'Content-Type' => 'text/html' }, ''] if (env['REQUEST_METHOD'] == 'HEAD')
+      return [200, { 'Content-Type' => 'text/html' }, ''] if (env['REQUEST_METHOD'] == 'HEAD')
       run if env['REQUEST_METHOD'] == 'GET'
     end
 
     def not_found
       body = "File not found: #{@path_info}\n"
       [404, {"Content-Type" => "text/plain",
-         "Content-Length" => body.size.to_s,
-         "X-Cascade" => "pass"},
+             "Content-Length" => body.size.to_s,
+             "X-Cascade" => "pass"},
        [body]]
     end
 
     #noinspection RubyUnusedLocalVariable
-    def run
+    def run(focused_suite = nil)
       jasmine_files = @jasmine_files
       css_files = @jasmine_stylesheets + (@config.css_files || [])
-      js_files = @config.js_files
-
+      js_files = focused_suite.nil? ? @config.js_files : @config.focused_files(focused_suite)
       body = ERB.new(File.read(File.join(File.dirname(__FILE__), "run.html.erb"))).result(binding)
       [
         200,
@@ -72,18 +71,8 @@ module Jasmine
     end
 
     def call(env)
-      spec_files = @config.spec_files_or_proc
-      matching_specs = spec_files.select {|spec_file| spec_file =~ /#{Regexp.escape(env["PATH_INFO"])}/ }.compact
-      if !matching_specs.empty?
-        run_adapter = Jasmine::RunAdapter.new(matching_specs, @options)
-        run_adapter.run
-      else
-        [
-          200,
-          { 'Content-Type' => 'application/javascript' },
-          "document.write('<p>Couldn\\'t find any specs matching #{env["PATH_INFO"]}!</p>');"
-        ]
-      end
+      run_adapter = Jasmine::RunAdapter.new(@config)
+      run_adapter.run(env["PATH_INFO"])
     end
 
   end
@@ -97,7 +86,7 @@ module Jasmine
 
       require 'thin'
       thin_config = {
-        '/__suite__' => Jasmine::FocusedSuite.new(@config),
+        '/__suite__/' => Jasmine::FocusedSuite.new(@config),
         '/run.html' => Jasmine::Redirect.new('/'),
         '/' => Jasmine::RunAdapter.new(@config)
       }

data/spec/config_spec.rb

@@ -44,6 +44,7 @@ describe Jasmine::Config do
         @config.src_files.should == []
         @config.stylesheets.should == []
         @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
+        @config.focused_files("javascripts/ExampleSpec.js").should == ['/__spec__/javascripts/ExampleSpec.js']
         @config.mappings.should == {
           '/__root__' => @config.project_root,
           '/__spec__' => @config.spec_dir
@@ -56,6 +57,7 @@ describe Jasmine::Config do
         @config.src_files.should == []
         @config.stylesheets.should == []
         @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
+        @config.focused_files("javascripts/ExampleSpec.js").should == ['/__spec__/javascripts/ExampleSpec.js']
         @config.mappings.should == {
           '/__root__' => @config.project_root,
           '/__spec__' => @config.spec_dir
@@ -66,9 +68,10 @@ describe Jasmine::Config do
         @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
         @config.src_files.should == []
         @config.spec_files.should == ['javascripts/ExampleSpec.js', 'javascripts/SpecHelper.js']
+        @config.focused_files("javascripts/ExampleSpec.js").should == ['/__spec__/javascripts/ExampleSpec.js']
         @config.mappings.should == {
-          '/__root__' => @config.project_root,
-          '/__spec__' => @config.spec_dir
+        '/__root__' => @config.project_root,
+        '/__spec__' => @config.spec_dir
         }
       end
 
@@ -106,6 +109,15 @@ describe Jasmine::Config do
           '/__spec__/javascripts/ExampleSpec.js',
           '/__spec__/javascripts/SpecHelper.js',
         ]
+        @config.focused_files("javascripts/ExampleSpec.js").should == [
+          '/javascripts/prototype.js',
+          '/javascripts/effects.js',
+          '/javascripts/controls.js',
+          '/javascripts/dragdrop.js',
+          '/javascripts/application.js',
+          '/__spec__/javascripts/ExampleSpec.js'
+        ]
+
       end
 
       it "should provide a list of all spec files with full paths" do

data/spec/server_spec.rb

@@ -10,12 +10,10 @@ end
 describe Jasmine::Server do
   before(:each) do
     config = Jasmine::Config.new
-    config.stub!(:mappings).and_return({
-        "/src" => File.join(Jasmine.root, "src"),
-        "/spec" => File.join(Jasmine.root, "spec")
-    })
-
-    config.stub!(:js_files).and_return(["/src/file1.js", "/spec/file2.js"])
+    config.stub!(:spec_dir).and_return(File.join(Jasmine.root, "spec"))
+    config.stub!(:src_dir).and_return(File.join(Jasmine.root, "src"))
+    config.stub!(:src_files).and_return(["file1.js"])
+    config.stub!(:spec_files).and_return(["file2.js"])
 
     @server = Jasmine::Server.new(0, config)
     @thin_app = @server.thin.app
@@ -25,11 +23,18 @@ describe Jasmine::Server do
     @server.thin.stop if @server && @server.thin.running?
   end
 
-  it "should serve static files" do
-    code, headers, body = @thin_app.call("PATH_INFO" => "/spec/suites/EnvSpec.js", "SCRIPT_NAME" => "xxx")
+  it "should serve static files from spec dir under __spec__" do
+    code, headers, body = @thin_app.call("PATH_INFO" => "/__spec__/suites/EnvSpec.js", "SCRIPT_NAME" => "xxx")
     code.should == 200
     headers["Content-Type"].should == "application/javascript"
     read(body).should == File.read(File.join(Jasmine.root, "spec/suites/EnvSpec.js"))
+    end
+
+  it "should serve static files from root dir under /" do
+    code, headers, body = @thin_app.call("PATH_INFO" => "/base.js", "SCRIPT_NAME" => "xxx")
+    code.should == 200
+    headers["Content-Type"].should == "application/javascript"
+    read(body).should == File.read(File.join(Jasmine.root, "src/base.js"))
   end
 
   it "should serve Jasmine static files under /__JASMINE_ROOT__/" do
@@ -39,6 +44,16 @@ describe Jasmine::Server do
     read(body).should == File.read(File.join(Jasmine.root, "lib/jasmine.css"))
   end
 
+  it "should serve focused suites when prefixing spec files with /__suite__/" do
+    Dir.stub!(:glob).and_return do |glob_string|
+      glob_string
+    end
+    code, headers, body = @thin_app.call("PATH_INFO" => "/__suite__/file2.js", "SCRIPT_NAME" => "xxx")
+    code.should == 200
+    headers["Content-Type"].should == "text/html"
+    read(body).should include("\"/__spec__/file2.js")
+  end
+
   it "should redirect /run.html to /" do
     code, headers, body = @thin_app.call("PATH_INFO" => "/run.html", "SCRIPT_NAME" => "xxx")
     code.should == 302
@@ -56,9 +71,9 @@ describe Jasmine::Server do
       code, headers, body = @thin_app.call("PATH_INFO" => "/", "SCRIPT_NAME" => "xxx", "REQUEST_METHOD" => 'GET')
       code.should == 200
       body = read(body)
-      body.should include("\"/src/file1.js")
-      body.should include("\"/spec/file2.js")
-      body.should satisfy {|s| s.index("/src/file1.js") < s.index("/spec/file2.js") }
+      body.should include("\"/file1.js")
+      body.should include("\"/__spec__/file2.js")
+      body.should satisfy {|s| s.index("/file1.js") < s.index("/__spec__/file2.js") }
     end
 
     it "should return an empty 200 for HEAD requests to /" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jasmine
 version: !ruby/object:Gem::Version 
-  version: 0.10.2.0
+  version: 0.10.2.1
 platform: ruby
 authors: 
 - Rajan Agaskar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -07:00
+date: 2010-03-19 00:00:00 -07:00
 default_executable: jasmine
 dependencies: 
 - !ruby/object:Gem::Dependency