jasmine-headless-webkit 0.6.2 → 0.6.3

data/lib/jasmine/files_list.rb

@@ -123,7 +123,7 @@ module Jasmine
       data = @options[:config].dup
       [ [ 'src_files', 'src_dir' ], [ 'stylesheets', 'src_dir' ], [ 'helpers', 'spec_dir' ], [ 'spec_files', 'spec_dir' ] ].each do |searches, root|
         if data[searches]
-          data[searches].collect do |search|
+          data[searches].flatten.collect do |search|
             path = search
             path = File.join(data[root], path) if data[root]
             found_files = Dir[path] - @files

data/lib/jasmine/headless/errors.rb

@@ -8,6 +8,8 @@ module Jasmine
 
     class TestFailure < StandardError; end
     class ConsoleLogUsage < StandardError ; end
+
+    class JasmineConfigNotFound < Errno::ENOENT ; end
   end
 end
 

data/lib/jasmine/headless/runner.rb

@@ -46,6 +46,8 @@ module Jasmine
       end
 
       def jasmine_config
+        raise JasmineConfigNotFound.new("Jasmine config not found. I tried #{@options[:jasmine_config]}.") if !File.file?(@options[:jasmine_config])
+
         @jasmine_config ||= JASMINE_DEFAULTS.dup.merge(YAML.load_file(@options[:jasmine_config]))
       end
 

data/lib/jasmine/template_writer.rb

@@ -28,7 +28,11 @@ module Jasmine
   <title>Jasmine Test Runner</title>
   <script type="text/javascript">
     window.console = { log: function(data) { 
-      JHW.log(JSON.stringify(data));
+      if (typeof(jQuery) !== 'undefined' && data instanceof jQuery) {
+        JHW.log($("<div />").append(data).html());
+      } else {
+        JHW.log(JSON.stringify(data));
+      }
     }, pp: function(data) {
       JHW.log(jasmine ? jasmine.pp(data) : JSON.stringify(data));
     } };

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

@@ -1,7 +1,7 @@
 module Jasmine
   module Headless
     module Webkit
-      VERSION = "0.6.2"
+      VERSION = "0.6.3"
     end
   end
 end

data/lib/qt/qmake.rb

@@ -1,4 +1,5 @@
 require 'rbconfig'
+require 'rubygems'
 require 'rubygems/version'
 
 module Qt

data/spec/lib/jasmine/files_list_spec.rb

@@ -38,23 +38,42 @@ describe Jasmine::FilesList do
       end
     end
 
-    let(:config) { {
-      'src_dir' => src_dir,
-      'spec_dir' => spec_dir,
-      'src_files' => [ 'js/first_file.js', 'js/*.js' ],
-      'spec_files' => [ '*_spec.js' ],
-      'helpers' => [ 'helper/*.js' ],
-      'stylesheets' => [ 'stylesheet/*.css' ]
-    } }
+    shared_examples_for :reading_data do
+      it 'should read the data from the jasmine.yml file and add the files' do
+        files_list.files.should == Jasmine::FilesList::DEFAULT_FILES + [
+          File.expand_path(first_file),
+          File.expand_path(src_file),
+          File.expand_path(stylesheet_file),
+          File.expand_path(helper_file),
+          File.expand_path(spec_file)
+        ]
+      end
+    end
 
-    it 'should read the data from the jasmine.yml file and add the files' do
-      files_list.files.should == Jasmine::FilesList::DEFAULT_FILES + [
-        File.expand_path(first_file),
-        File.expand_path(src_file),
-        File.expand_path(stylesheet_file),
-        File.expand_path(helper_file),
-        File.expand_path(spec_file)
-      ]
+    context 'with normal list' do
+      let(:config) { {
+        'src_dir' => src_dir,
+        'spec_dir' => spec_dir,
+        'src_files' => [ 'js/first_file.js', 'js/*.js' ],
+        'spec_files' => [ '*_spec.js' ],
+        'helpers' => [ 'helper/*.js' ],
+        'stylesheets' => [ 'stylesheet/*.css' ]
+      } }
+
+      it_should_behave_like :reading_data
+    end
+
+    context 'with multidimensional list' do
+      let(:config) { {
+        'src_dir' => src_dir,
+        'spec_dir' => spec_dir,
+        'src_files' => [ [ 'js/first_file.js', 'js/*.js' ] ],
+        'spec_files' => [ '*_spec.js' ],
+        'helpers' => [ 'helper/*.js' ],
+        'stylesheets' => [ 'stylesheet/*.css' ]
+      } }
+
+      it_should_behave_like :reading_data
     end
   end
 

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

@@ -18,16 +18,29 @@ describe Jasmine::Headless::Runner do
   describe '#load_config' do
     include FakeFS::SpecHelpers
 
-    let(:opts) { { :jasmine_config => 'test.yml' } }
-
     before do
-      File.open(Jasmine::Headless::Runner::RUNNER, 'w')
-      File.open('test.yml', 'w') { |fh| fh.print YAML.dump('test' => 'hello') }
+      File.open('ext/jasmine-webkit-specrunner/jasmine-webkit-specrunner', 'w')
+    end
+
+    let(:config_filename) { 'test.yml' }
+    let(:opts) { { :jasmine_config => config_filename } }
+
+    context 'file exists' do
+      before do
+        File.open(Jasmine::Headless::Runner::RUNNER, 'w')
+        File.open(config_filename, 'w') { |fh| fh.print YAML.dump('test' => 'hello') }
+      end
+
+      it 'should load the jasmine config' do
+        runner.jasmine_config['test'].should == 'hello'
+        runner.jasmine_config['spec_dir'].should == 'spec/javascripts'
+      end
     end
 
-    it 'should load the jasmine config' do
-      runner.jasmine_config['test'].should == 'hello'
-      runner.jasmine_config['spec_dir'].should == 'spec/javascripts'
+    context 'file does not exist' do
+      it 'should raise an exception' do
+        expect { runner.jasmine_config }.to raise_error(Jasmine::Headless::JasmineConfigNotFound, /#{config_filename}/)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-headless-webkit
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-08-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine-core
-  requirement: &70920300 !ruby/object:Gem::Requirement
+  requirement: &72010180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +23,10 @@ dependencies:
         version: 1.1.beta
   type: :runtime
   prerelease: false
-  version_requirements: *70920300
+  version_requirements: *72010180
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70920050 !ruby/object:Gem::Requirement
+  requirement: &72009930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +34,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70920050
+  version_requirements: *72009930
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70919860 !ruby/object:Gem::Requirement
+  requirement: &72009740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70919860
+  version_requirements: *72009740
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70919630 !ruby/object:Gem::Requirement
+  requirement: &72009510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,7 +56,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70919630
+  version_requirements: *72009510
 description: Run Jasmine specs headlessly
 email:
 - john@coswellproductions.com
@@ -149,7 +148,6 @@ files:
 - spec/lib/jasmine/template_writer_spec.rb
 - spec/lib/qt/qmake_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -170,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jasmine-headless-webkit
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Run Jasmine specs headlessly in a WebKit browser