jasmine-headless-webkit 0.4.1 → 0.4.2

data/ext/jasmine-webkit-specrunner/extconf.rb

@@ -1,2 +1,8 @@
-system %{qmake -spec macx-g++}
+case RUBY_PLATFORM
+when /linux/
+	system %{qmake -spec linux-g++}
+else
+	system %{qmake -spec macx-g++}
+end
+
 system %{make}

data/lib/jasmine-headless-webkit/version.rb

@@ -1,7 +1,7 @@
 module Jasmine
   module Headless
     module Webkit
-      VERSION = "0.4.1"
+      VERSION = "0.4.2"
     end
   end
 end

data/lib/jasmine/files_list.rb

@@ -11,7 +11,7 @@ end
 
 module Jasmine
   class FilesList
-    attr_reader :files, :filtered_files
+    attr_reader :files, :filtered_files, :spec_outside_scope
 
     DEFAULT_FILES = [
       File.join(Jasmine.root, "lib/jasmine.js"),
@@ -23,13 +23,14 @@ module Jasmine
       @options = options
       @files = DEFAULT_FILES.dup
       @filtered_files = @files.dup
+      @spec_outside_scope = false
       use_config! if config?
 
       @code_for_file = {}
     end
 
-    def use_spec?(file)
-      spec_filter.empty? || spec_filter.include?(file)
+    def has_spec_outside_scope?
+      @spec_outside_scope
     end
 
     def filtered?
@@ -114,10 +115,12 @@ module Jasmine
 
             @files += found_files
 
-            if searches == 'spec_files'
-              found_files = found_files.find_all { |file| use_spec?(file) }
-            end
-            @filtered_files += found_files
+            @filtered_files += (if searches == 'spec_files'
+              @spec_outside_scope = ((spec_filter | found_files).sort != found_files.sort)
+              spec_filter || found_files
+            else
+              found_files
+            end)
           end
         end
       end

data/lib/jasmine/headless/railtie.rb

@@ -1,25 +1,5 @@
 require 'jasmine/headless/task'
 
-module Digest
-  class JasmineTest
-    def self.file(file)
-      new
-    end
-
-    def file(file)
-      self
-    end
-    
-    def hexdigest
-      'test'
-    end
-
-    def update(prefix)
-      self
-    end
-  end
-end
-
 module Jasmine
   module Headless
     class Railtie < Rails::Railtie
@@ -27,15 +7,6 @@ module Jasmine
         Jasmine::Headless::Task.new do |t|
           t.colors = true
         end
-
-        if Rails.version >= "3.1.0"
-          desc 'Force generate static assets without an MD5 hash, all assets end with -test.<ext>'
-          task 'assets:precompile:for_testing' => :environment do
-            Rails.application.assets.digest_class = Digest::JasmineTest
-
-            Rake::Task['assets:precompile'].invoke
-          end
-        end
       end
     end
   end

data/lib/jasmine/headless/runner.rb

@@ -58,7 +58,7 @@ module Jasmine
 
         targets = Jasmine::TemplateWriter.write!(files_list)
         run_targets = targets.dup
-        run_targets.pop if !@options[:full_run] && files_list.filtered?
+        run_targets.pop if (!@options[:full_run] && files_list.filtered?) || files_list.has_spec_outside_scope?
 
         system jasmine_command(run_targets)
         status = $?.exitstatus

data/lib/jasmine/headless/task.rb

@@ -1,5 +1,25 @@
 require 'jasmine/headless/runner'
 
+module Digest
+  class JasmineTest
+    def self.file(file)
+      new
+    end
+
+    def file(file)
+      self
+    end
+    
+    def hexdigest
+      'test'
+    end
+
+    def update(prefix)
+      self
+    end
+  end
+end
+
 module Jasmine
   module Headless
     class Task
@@ -22,6 +42,15 @@ module Jasmine
             :jasmine_config => @jasmine_config
           )
         end
+
+        if Rails.version >= "3.1.0"
+          desc 'Force generate static assets without an MD5 hash, all assets end with -test.<ext>'
+          task 'assets:precompile:for_testing' => :environment do
+            Rails.application.assets.digest_class = Digest::JasmineTest
+
+            Rake::Task['assets:precompile'].invoke
+          end
+        end
       end
     end
   end

data/spec/bin/jasmine-headless-webkit_spec.rb

@@ -26,7 +26,7 @@ describe "jasmine-headless-webkit" do
       system %{bin/jasmine-headless-webkit -j spec/jasmine/success_with_error/success_with_error.yml --report #{report}}
       $?.exitstatus.should == 1
 
-      report.should be_a_report_containing(1, 0, false)
+      report.should be_a_report_containing(0, 0, false)
     end
   end
 
@@ -65,6 +65,13 @@ describe "jasmine-headless-webkit" do
 
         report.should be_a_report_containing(1, 0, false)
       end
+
+      it "should use a file outside the normal test run and only run one" do
+        system %{bin/jasmine-headless-webkit -j spec/jasmine/filtered_success/filtered_success.yml --report #{report} ./spec/jasmine/filtered_success/success_other_file.js}
+        $?.exitstatus.should == 0
+
+        report.should be_a_report_containing(1, 0, false)
+      end
     end
 
     context "do both runs" do

data/spec/jasmine/filtered_success/success_other_file.js

@@ -0,0 +1,7 @@
+describe('outside success', function() {
+  it('should succeed', function() {
+    expect(true).toEqual(true);
+  });
+});
+
+

data/spec/lib/jasmine/files_list_spec.rb

@@ -56,32 +56,6 @@ describe Jasmine::FilesList do
     end
   end
 
-  describe '#use_spec?' do
-    let(:spec_file) { 'my/spec.js' }
-
-    let(:files_list) { Jasmine::FilesList.new(:only => filter) }
-
-    context 'no filter provided' do
-      let(:filter) { [] }
-
-      it "should allow the spec" do
-        files_list.use_spec?(spec_file).should be_true
-      end
-    end
-
-    context 'filter provided' do
-      let(:filter) { [ spec_file ] }
-
-      it "should use the spec" do
-        files_list.use_spec?(spec_file).should be_true
-      end
-
-      it "should not use the spec" do
-        files_list.use_spec?('other/file').should be_false
-      end
-    end
-  end
-
   context 'with filtered specs' do
     let(:files_list) { Jasmine::FilesList.new(:only => filter, :config => config) }
     let(:spec_dir) { 'spec' }
@@ -99,15 +73,28 @@ describe Jasmine::FilesList do
       end
     end
 
-    let(:filter) { 'spec/one_spec.js' }
+    context 'filter with a file that is matchable' do
+      let(:filter) { [ File.expand_path('spec/one_spec.js') ] }
 
-    it 'should return all files for files' do
-      files_list.files.any? { |file| file['two_spec.js'] }.should be_true
-      files_list.filtered?.should be_true
+      it 'should return all files for files' do
+        files_list.files.any? { |file| file['two_spec.js'] }.should be_true
+        files_list.filtered?.should be_true
+        files_list.should_not have_spec_outside_scope
+      end
+
+      it 'should return only filtered files for filtered_files' do
+        files_list.filtered_files.any? { |file| file['two_spec.js'] }.should be_false
+        files_list.should_not have_spec_outside_scope
+      end
     end
 
-    it 'should return only filtered files for filtered_files' do
-      files_list.filtered_files.any? { |file| file['two_spec.js'] }.should be_false
+    context 'filter with a file that is not even there' do
+      let(:filter) { [ File.expand_path('spec/whatever.js') ] }
+
+      it 'should use the provided file' do
+        files_list.filtered_files.any? { |file| file['whatever.js'] }.should be_true
+        files_list.should have_spec_outside_scope
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -12,12 +12,20 @@ end
 
 RSpec::Matchers.define :be_a_report_containing do |total, fails, used_console|
   match do |filename|
-    parts = File.read(filename).strip.split('/')
-    parts.length.should == 4
+    parts(filename).length.should == 4
     parts[0].should == total.to_s
     parts[1].should == fails.to_s
     parts[2].should == (used_console ? "T" : "F")
     true
   end
+
+  failure_message_for_should do |filename|
+    parts(filename)
+    "expected #{filename} to be a report containing (#{total}, #{fails}, #{used_console.inspect}), instead it contained (#{parts[0]}, #{parts[1]}, #{(parts[2] == "T").inspect})"
+  end
+
+  def parts(filename = nil)
+    @parts ||= File.read(filename).strip.split('/')
+  end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: jasmine-headless-webkit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - John Bintz
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 -04:00
+date: 2011-06-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,6 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- .autotest
 - .gitignore
 - .rspec
 - CHANGELOG.md
@@ -104,6 +103,7 @@ files:
 - spec/jasmine/filtered_success/filtered_success.yml
 - spec/jasmine/filtered_success/src.js
 - spec/jasmine/filtered_success/success_one_spec.js
+- spec/jasmine/filtered_success/success_other_file.js
 - spec/jasmine/filtered_success/success_two_spec.js
 - spec/jasmine/success/success.js
 - spec/jasmine/success/success.yml
@@ -162,6 +162,7 @@ test_files:
 - spec/jasmine/filtered_success/filtered_success.yml
 - spec/jasmine/filtered_success/src.js
 - spec/jasmine/filtered_success/success_one_spec.js
+- spec/jasmine/filtered_success/success_other_file.js
 - spec/jasmine/filtered_success/success_two_spec.js
 - spec/jasmine/success/success.js
 - spec/jasmine/success/success.yml

data/.autotest

@@ -1,9 +0,0 @@
-Autotest.add_hook(:initialize) do |at|
-  at.add_mapping(%r{bin/.*}, true) do |filename|
-    at.files_matching(%r{spec/bin/.*})
-  end
-
-  at.add_mapping(%r{spec/jasmine/.*}, true) do |filename|
-    at.files_matching(%r{spec/bin/.*})
-  end
-end