jasmine-headless-webkit 0.4.2 → 0.5.0

data/ext/jasmine-webkit-specrunner/specrunner.cpp

@@ -319,11 +319,21 @@ void HeadlessSpecRunner::timerEvent(QTimerEvent *event)
         }
       }
 
-      if ((exitCode == 0 && runnerFiles.count() == 0) || (exitCode != 0)) {
-        QApplication::instance()->exit(exitCode);
+      bool runAgain = true;
+
+      if (runnerFiles.count() == 0) {
+        runAgain = false;
       } else {
+        if (exitCode == 1) {
+          runAgain = false;
+        }
+      }
+
+      if (runAgain) {
         isFinished = false;
         loadSpec();
+      } else {
+        QApplication::instance()->exit(exitCode);
       }
     }
 

data/jasmine-headless-webkit.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'jasmine'
+  s.add_dependency 'jasmine', '~>1.1.beta'
   s.add_dependency 'coffee-script', '>= 2.2'
   s.add_dependency 'rainbow'
 end

data/lib/jasmine/files_list.rb

@@ -14,8 +14,8 @@ module Jasmine
     attr_reader :files, :filtered_files, :spec_outside_scope
 
     DEFAULT_FILES = [
-      File.join(Jasmine.root, "lib/jasmine.js"),
-      File.join(Jasmine.root, "lib/jasmine-html.js"),
+      File.join(Jasmine::Core.path, "jasmine.js"),
+      File.join(Jasmine::Core.path, "jasmine-html.js"),
       File.expand_path('../../../jasmine/jasmine.headless-reporter.js', __FILE__)
     ]
 
@@ -99,7 +99,7 @@ module Jasmine
     end
 
     def spec_filter
-      @options[:only] || []
+      @spec_filter ||= (@options[:only] ? @options[:only].collect { |path| Dir[path] }.flatten : [])
     end
 
     def use_config!
@@ -117,7 +117,7 @@ module Jasmine
 
             @filtered_files += (if searches == 'spec_files'
               @spec_outside_scope = ((spec_filter | found_files).sort != found_files.sort)
-              spec_filter || found_files
+              spec_filter.empty? ? found_files : (spec_filter || found_files)
             else
               found_files
             end)

data/lib/jasmine/headless/errors.rb

@@ -5,6 +5,9 @@ module Jasmine
         "The jasmine-headless-webkit specrunner (jasmine-webkit-specrunner) could not be found! Try reinstalling the gem."
       end
     end
+
+    class TestFailure < StandardError; end
+    class ConsoleLogUsage < StandardError ; end
   end
 end
 

data/lib/jasmine/headless/task.rb

@@ -9,7 +9,7 @@ module Digest
     def file(file)
       self
     end
-    
+
     def hexdigest
       'test'
     end
@@ -35,14 +35,13 @@ module Jasmine
         yield self if block_given?
 
         desc 'Run Jasmine specs headlessly'
-        task name do
-          Jasmine::Headless::Runner.run(
-            :colors => colors, 
-            :remove_html_file => !@keep_on_error, 
-            :jasmine_config => @jasmine_config
-          )
-        end
+        task(name) { run_rake_task }
+
+        create_rails_compliant_task if defined?(Rails)
+      end
 
+      private
+      def create_rails_compliant_task
         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
@@ -52,6 +51,19 @@ module Jasmine
           end
         end
       end
+
+      def run_rake_task
+        case Jasmine::Headless::Runner.run(
+          :colors => colors,
+          :remove_html_file => !@keep_on_error,
+          :jasmine_config => @jasmine_config
+        )
+        when 1
+          raise Jasmine::Headless::TestFailure
+        when 2
+          raise Jasmine::Headless::ConsoleLogUsage
+        end
+      end
     end
   end
 end

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

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

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

@@ -26,7 +26,10 @@ 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(0, 0, false)
+      # returns are unpredictable due to changes in jasmine! >.<
+      # all we can do is ensure that we've actually failed
+      #
+      # report.should be_a_report_containing(0, 0, false)
     end
   end
 
@@ -88,6 +91,13 @@ describe "jasmine-headless-webkit" do
 
         report.should be_a_report_containing(2, 0, false)
       end
+
+      it "should succeed and run both, with the first having a console.log call" do
+        system %{bin/jasmine-headless-webkit -j spec/jasmine/filtered_success_with_console/filtered_success.yml --report #{report} ./spec/jasmine/filtered_success_with_console/success_one_spec.js}
+        $?.exitstatus.should == 2
+
+        report.should be_a_report_containing(2, 0, true)
+      end
     end
   end
 end

data/spec/jasmine/filtered_success_with_console/filtered_success.yml

@@ -0,0 +1,10 @@
+src_files:
+  - spec/jasmine/filtered_success_with_console/src.js
+
+spec_files:
+  - spec/jasmine/filtered_success_with_console/*_spec.js
+
+src_dir: .
+spec_dir: .
+
+

data/spec/jasmine/filtered_success_with_console/success_one_spec.js

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

data/spec/jasmine/filtered_success_with_console/success_two_spec.js

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

data/spec/lib/jasmine/files_list_spec.rb

@@ -9,8 +9,8 @@ describe Jasmine::FilesList do
   describe '#initialize' do
     it "should have default files" do
       files_list.files.should == [
-        File.join(Jasmine.root, "lib/jasmine.js"),
-        File.join(Jasmine.root, "lib/jasmine-html.js"),
+        File.join(Jasmine::Core.path, "jasmine.js"),
+        File.join(Jasmine::Core.path, "jasmine-html.js"),
         File.expand_path('jasmine/jasmine.headless-reporter.js')
       ]
     end
@@ -68,11 +68,21 @@ describe Jasmine::FilesList do
     } }
 
     before do
-      %w{one_spec.js two_spec.js}.each do |file|
+      %w{one_spec.js two_spec.js whatever.js}.each do |file|
         File.open(File.join(spec_dir, file), 'w')
       end
     end
 
+    context 'empty filter' do
+      let(:filter) { [] }
+
+      it 'should return all files for filtered and all files' do
+        files_list.files.any? { |file| file['two_spec.js'] }.should be_true
+        files_list.filtered?.should be_false
+        files_list.should_not have_spec_outside_scope
+      end
+    end
+
     context 'filter with a file that is matchable' do
       let(:filter) { [ File.expand_path('spec/one_spec.js') ] }
 
@@ -88,6 +98,21 @@ describe Jasmine::FilesList do
       end
     end
 
+    context 'filter with a glob' do
+      let(:filter) { [ File.expand_path('spec/one*') ] }
+
+      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
+
     context 'filter with a file that is not even there' do
       let(:filter) { [ File.expand_path('spec/whatever.js') ] }
 

data/spec/lib/jasmine/headless/options_spec.rb

@@ -66,4 +66,36 @@ describe Jasmine::Headless::Options do
       options[:jasmine_config].should == 'test'
     end
   end
+
+  describe '.from_command_line' do
+    before do
+      @argv = ARGV.dup
+    end
+
+    let(:options) { described_class.from_command_line }
+
+    context 'no files specified' do
+      before do
+        ARGV.replace([])
+      end
+
+      it 'should have no files' do
+        options[:files].should == []
+      end
+    end
+
+    context 'files specified' do
+      before do
+        ARGV.replace([ "test" ])
+      end
+
+      it 'should have files' do
+        options[:files].should == [ "test" ]
+      end
+    end
+
+    after do
+      ARGV.replace(@argv)
+    end
+  end
 end

data/spec/lib/jasmine/headless/task_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+require 'fakefs/spec_helpers'
+require 'jasmine/headless/task'
+require 'mocha'
+
+describe Jasmine::Headless::Task do
+  before do
+    Jasmine::Headless::Task.any_instance.stubs(:desc)
+    Jasmine::Headless::Task.any_instance.stubs(:task)
+  end
+
+  after do
+    Object.send(:remove_const, :Rails) if defined?(Rails)
+  end
+
+  describe 'define task' do
+    context 'without Rails' do
+      it 'should not explode when Rails is undefined' do
+        Jasmine::Headless::Task.new('jasmine:headless')
+      end
+    end
+
+    context 'with Rails' do
+      before do
+        module Rails
+          def self.version
+            return "0"
+          end
+        end
+      end
+
+      it 'should be OK if rails is defined' do
+        Jasmine::Headless::Task.new('jasmine:headless')
+      end
+    end
+  end
+
+  describe 'jasmine:headless integration test' do
+    context 'with successful test' do
+      let(:test) do
+        described_class.new do |t|
+          t.jasmine_config = "spec/jasmine/success/success.yml"
+        end
+      end
+
+      it 'should do nothing on success' do
+        expect { test.send(:run_rake_task) }.to_not raise_error
+      end
+    end
+
+    context 'with failing test' do
+      let(:test) do
+        described_class.new do |t|
+          t.jasmine_config = "spec/jasmine/failure/failure.yml"
+        end
+      end
+
+      it 'should raise an exception on failure' do
+        expect { test.send(:run_rake_task) }.to raise_error(Jasmine::Headless::TestFailure)
+      end
+    end
+
+    context 'with console.log using test' do
+      let(:test) do
+        described_class.new do |t|
+          t.jasmine_config = "spec/jasmine/console_log/console_log.yml"
+        end
+      end
+
+      it 'should raise an exception on console.log usage' do
+        expect { test.send(:run_rake_task) }.to raise_error(Jasmine::Headless::ConsoleLogUsage)
+      end
+    end
+  end
+end
+

metadata

@@ -2,7 +2,7 @@
 name: jasmine-headless-webkit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors: 
 - John Bintz
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -04:00
+date: 2011-07-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,9 +21,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.1.beta
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,10 @@ files:
 - 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/filtered_success_with_console/filtered_success.yml
+- spec/jasmine/filtered_success_with_console/src.js
+- spec/jasmine/filtered_success_with_console/success_one_spec.js
+- spec/jasmine/filtered_success_with_console/success_two_spec.js
 - spec/jasmine/success/success.js
 - spec/jasmine/success/success.yml
 - spec/jasmine/success/success_spec.js
@@ -114,6 +118,7 @@ files:
 - spec/lib/jasmine/files_list_spec.rb
 - spec/lib/jasmine/headless/options_spec.rb
 - spec/lib/jasmine/headless/runner_spec.rb
+- spec/lib/jasmine/headless/task_spec.rb
 - spec/lib/jasmine/template_writer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -164,6 +169,10 @@ test_files:
 - 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/filtered_success_with_console/filtered_success.yml
+- spec/jasmine/filtered_success_with_console/src.js
+- spec/jasmine/filtered_success_with_console/success_one_spec.js
+- spec/jasmine/filtered_success_with_console/success_two_spec.js
 - spec/jasmine/success/success.js
 - spec/jasmine/success/success.yml
 - spec/jasmine/success/success_spec.js
@@ -173,5 +182,6 @@ test_files:
 - spec/lib/jasmine/files_list_spec.rb
 - spec/lib/jasmine/headless/options_spec.rb
 - spec/lib/jasmine/headless/runner_spec.rb
+- spec/lib/jasmine/headless/task_spec.rb
 - spec/lib/jasmine/template_writer_spec.rb
 - spec/spec_helper.rb