qunited 0.4.0 → 0.4.1

data/README.md

@@ -1,5 +1,7 @@
 <img src="http://i.imgur.com/NIoQy.png" width="150px" />
 
+_Pronounced "queue united"_
+
 QUnited is a tool to run headless JavaScript tests with QUnit.
 
 Tests are run with PhantomJS if available, otherwise Rhino (Java) is used. Give it a try and let me know if you have any feedback.
@@ -36,11 +38,11 @@ require 'qunited/rake_task'
 
 QUnited::RakeTask.new do |t|
   t.source_files = ['lib/js/jquery.js', 'lib/js/my_app_1.js', 'lib/js/my_app_2.js']
-  t.test_files_pattern = 'test/js/**/*.js'
+  t.test_files = 'test/js/**/*.js'
 end
 ```
 
-Source and test files can be configured either as an array of file names or a glob pattern (using the ```_pattern``` version). Using an array is usually desirable for source files since the order of their execution is often important. Note that all JavaScript dependencies will have to be loaded with source files, in the correct order, to match your production environment.
+Source and test files can be configured either as an array of file names or a glob pattern string. Using an array is usually desirable for source files since the order of their execution is often important. Note that all JavaScript dependencies (jQuery, underscore, etc.) will have to be loaded with source files, in the correct order, to match your production environment.
 
 You can also use an array to configure the test files but a glob pattern might be more convenient since test files usually do not need to be loaded in a particular order.
 
@@ -51,7 +53,7 @@ QUnited uses various drivers to set up the environment the tests run in (see bel
 ```ruby
 QUnited::RakeTask.new do |t|
   t.source_files = ['lib/js/jquery.js', 'lib/js/my_app']
-  t.test_files_pattern = 'test/js/**/*.js'
+  t.test_files = 'test/js/**/*.js'
   t.driver = :phantomjs # Always use PhantomJS to run tests. Fail if it's not available.
 end
 ```

data/lib/qunited/driver/phantomjs/support/tests_page.html.erb

@@ -9,6 +9,7 @@
     <div id="qunit-testrunner-toolbar"></div>
     <h2 id="qunit-userAgent"></h2>
     <ol id="qunit-tests"></ol>
+    <div id="qunit-fixture"></div>
 </body>
 <%= script_tag support_file_path('qunit.js') %>
 <%= script_tag support_file_path('qunited.js') %>

data/lib/qunited/rake_task.rb

@@ -15,8 +15,8 @@ module QUnited
       @source_files = pattern
     end
 
-    # Array of JavaScript source files (and any dependencies). These will be loaded in order
-    # before loading the QUnit tests.
+    # Array or glob pattern of JavaScript source files (and any dependencies). These will be
+    # loaded in order if specified as an array.
     attr_accessor :source_files
 
     # <b>DEPRECATED:</b> Please use <tt>test_files=</tt>, which now takes either an array of files
@@ -26,9 +26,14 @@ module QUnited
       @test_files = pattern
     end
 
-    # Array of QUnit test files.
+    # Array or glob pattern of QUnit test files. These will be loaded in order if specified as an array.
     attr_accessor :test_files
 
+    # Array or glob pattern of test helper files. These include extra libraries for mocks or other
+    # test tools. These are loaded after source files and before test files. These will be loaded
+    # in order if specified as an array.
+    attr_accessor :helper_files
+
     # The driver to use to run the QUnit tests.
     attr_accessor :driver
 
@@ -63,11 +68,19 @@ module QUnited
       task name do
         RakeFileUtils.send(:verbose, verbose) do
           if source_files_to_include.empty?
-            msg = "No JavaScript source files specified"
-            msg << " with pattern #{source_files_pattern}" if source_files_pattern
-            puts msg
+            msg = if source_files.is_a? String
+              "No JavaScript source files match the pattern '#{source_files}'"
+            else
+              'No JavaScript source files specified'
+            end
+            fail msg
           elsif test_files_to_run.empty?
-            puts "No QUnit test files matching #{test_files_pattern} could be found"
+            msg = if test_files.is_a? String
+              "No QUnit test files match the pattern '#{test_files}'"
+            else
+              'No QUnit test files specified'
+            end
+            fail msg
           else
             command = test_command
             puts command if verbose
@@ -91,8 +104,9 @@ module QUnited
       task (name.to_s + ':server') do
         require 'qunited/server'
         server_options = {
-          :source_files => source_files_to_include,
-          :test_files => test_files_to_run
+          :source_files => source_and_helper_files,
+          :test_files => test_files_to_run,
+          :verbose => verbose
         }
         server_options[:port] = @server_port if @server_port
         ::QUnited::Server.new(server_options).start
@@ -104,19 +118,28 @@ module QUnited
     def test_command
       cmd = 'qunited'
       cmd << " --driver #{driver}" if driver
-      cmd << " #{source_files_to_include.join(' ')} -- #{test_files_to_run.join(' ')}"
+      cmd << " #{source_and_helper_files.join(' ')} -- #{test_files_to_run.join(' ')}"
     end
 
     def source_files_to_include
       files_array source_files
     end
 
+    def helper_files_to_include
+      files_array helper_files
+    end
+
     def test_files_to_run
       files_array test_files
     end
 
+    def source_and_helper_files
+      source_files_to_include + helper_files_to_include
+    end
+
     # Force convert to array of files if glob pattern
     def files_array(files)
+      return [] unless files
       files.is_a?(Array) ? files : pattern_to_filelist(files.to_s)
     end
 

data/lib/qunited/runner.rb

@@ -11,6 +11,8 @@ module QUnited
     end
 
     def run
+      [js_source_files, js_test_files].each { |files| confirm_existence_of_files files }
+
       driver_class, formatter_class = resolve_driver_class, resolve_formatter_class
       driver = driver_class.new(js_source_files, js_test_files)
       driver.formatter = formatter_class.new({:driver_name => driver.name})
@@ -69,5 +71,9 @@ module QUnited
     def best_available_driver
       DRIVERS_PRIORITY.map { |driver| get_driver(driver) }.find { |driver| driver.available? }
     end
+
+    def confirm_existence_of_files(files_array)
+      files_array.each { |f| raise UsageError, "File not found: #{f}" unless File.exist? f }
+    end
   end
 end

data/lib/qunited/server/test_suite.html.erb

@@ -10,6 +10,7 @@
     <div id="qunit-testrunner-toolbar"></div>
     <h2 id="qunit-userAgent"></h2>
     <ol id="qunit-tests"></ol>
+    <div id="qunit-fixture"></div>
 </body>
 <%= asset_script_tag 'qunit.js' %>
 

data/lib/qunited/server.rb

@@ -17,11 +17,21 @@ module QUnited
 
     def initialize(opts={})
       @source_files, @test_files = opts[:source_files], opts[:test_files]
+      @port = opts[:port] || DEFAULT_PORT
 
       server_options = {
-        :Port => opts[:port] || DEFAULT_PORT
+        :Port => @port
       }
 
+      unless opts[:verbose]
+        server_options[:AccessLog] = []
+
+        dev_null = '/dev/null'
+        if File.exist?(dev_null) && File.writable?(dev_null)
+          server_options[:Logger] = WEBrick::Log.new(dev_null)
+        end
+      end
+
       @server = ::WEBrick::HTTPServer.new(server_options)
 
       @server.mount_proc '/' do |request, response|
@@ -34,7 +44,6 @@ module QUnited
         when /^\/#{QUNITED_ASSET_FILE_PREFIX}\/(.*)/
           filename = $1
           response['Content-Type'] = (filename =~ /\.js$/) ? 'application/javascript' : 'text/css'
-          puts "HUH? #{filename}"
           response.body = IO.read(asset_path filename)
         else
           response['Content-Type'] = 'text/html'
@@ -49,6 +58,7 @@ module QUnited
     end
 
     def start
+      $stderr.puts "Serving QUnit test suite on port #{@port}\nCtrl-C to shutdown"
       @server.start
     end
 

data/lib/qunited/version.rb

@@ -1,3 +1,3 @@
 module QUnited
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,24 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: qunited
-version: !ruby/object:Gem::Version
-  version: 0.4.0
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
-authors:
+authors: 
 - Aaron Royer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+
+date: 2013-03-23 00:00:00 Z
 dependencies: []
+
 description: QUnited runs headless QUnit tests as part of your normal build
-email:
+email: 
 - aaronroyer@gmail.com
-executables:
+executables: 
 - qunited
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -75,29 +84,38 @@ files:
 - test/unit/test_runner.rb
 homepage: https://github.com/aaronroyer/qunited
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: qunited
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: QUnit tests in your build
-test_files:
+test_files: 
 - test/fixtures/basic_project/app/assets/javascripts/application.js
 - test/fixtures/basic_project/test/javascripts/test_basics.js
 - test/fixtures/basic_project/test/javascripts/test_math.js