teaspoon 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8ffc6219e0e838470408d91b594a02577eea996
-  data.tar.gz: 554631fbea03ee62eccc64e72e3a01058fcccf40
+  metadata.gz: 727bdb9217114560c7755d33ed032e6c05355a7f
+  data.tar.gz: b9cdd9f870082cebd6dd8cd3db297a3a425a8620
 SHA512:
-  metadata.gz: a01d5ce7d1720a38df484a26bbebc02a702e3f2b45031d130de8db4df46fe22d493823d309340a3cb158ec4f1399878f304f23d70b1b13f332ecac672549e0b8
-  data.tar.gz: 637de65f6914f5c5fca583c567ca2f6c2e82fb8a57764cced9816e1a782cd00f6e2ed053acd75ba6013254a7a3ddbfed26487c09355a5169e3b11e1d173d32d3
+  metadata.gz: 8c7403b545340d18c0290390108fa541d65079f7bc7c955f9816ba10d51aa07f57082754adfc36e63a81f1a5347e1b4081a4de9c4596cc0e844e868ccaa58dd9
+  data.tar.gz: 622b7ecb4873067b55e25ebbe2647c61bc6070a50e63c17db2674704e39ffe64b1173a7eefbcf76dfbe619dfd2c79b816a1b1dae7dff30ca50bc494cea6681d7

data/README.md

@@ -1,7 +1,7 @@
 Teaspoon
 ========
 
-[![Gem Version](https://img.shields.io/gem/v/guard-teaspoon.svg)](https://rubygems.org/gems/teaspoon)
+[![Gem Version](https://img.shields.io/gem/v/teaspoon.svg)](https://rubygems.org/gems/teaspoon)
 [![Dependency Status](https://gemnasium.com/modeset/teaspoon.svg)](https://gemnasium.com/modeset/teaspoon)
 [![Build Status](https://img.shields.io/travis/modeset/teaspoon.svg)](https://travis-ci.org/modeset/teaspoon)
 [![Code Climate](https://codeclimate.com/github/modeset/teaspoon/badges/gpa.svg)](https://codeclimate.com/github/modeset/teaspoon)

data/app/assets/javascripts/teaspoon-jasmine.js

@@ -344,11 +344,10 @@
 }).call(this);
 (function() {
   Teaspoon.hook = function(name, payload) {
-    var method, xhr, xhrRequest;
+    var xhr, xhrRequest;
     if (payload == null) {
       payload = {};
     }
-    method = "POST";
     xhr = null;
     xhrRequest = function(url, payload, callback) {
       var e;
@@ -941,13 +940,13 @@
 
     viewId = 0;
 
-    function SuiteView(suite1, reporter) {
-      this.suite = suite1;
+    function SuiteView(suite, reporter) {
+      this.suite = suite;
       this.reporter = reporter;
       this.views = this.reporter.views;
       this.suite.viewId = viewId += 1;
       this.views.suites[this.suite.viewId] = this;
-      this.suite = new Teaspoon.Suite(suite);
+      this.suite = new Teaspoon.Suite(this.suite);
       SuiteView.__super__.constructor.apply(this, arguments);
     }
 

data/app/assets/javascripts/teaspoon-mocha.js

@@ -344,11 +344,10 @@
 }).call(this);
 (function() {
   Teaspoon.hook = function(name, payload) {
-    var method, xhr, xhrRequest;
+    var xhr, xhrRequest;
     if (payload == null) {
       payload = {};
     }
-    method = "POST";
     xhr = null;
     xhrRequest = function(url, payload, callback) {
       var e;
@@ -941,13 +940,13 @@
 
     viewId = 0;
 
-    function SuiteView(suite1, reporter) {
-      this.suite = suite1;
+    function SuiteView(suite, reporter) {
+      this.suite = suite;
       this.reporter = reporter;
       this.views = this.reporter.views;
       this.suite.viewId = viewId += 1;
       this.views.suites[this.suite.viewId] = this;
-      this.suite = new Teaspoon.Suite(suite);
+      this.suite = new Teaspoon.Suite(this.suite);
       SuiteView.__super__.constructor.apply(this, arguments);
     }
 

data/app/assets/javascripts/teaspoon-qunit.js

@@ -344,11 +344,10 @@
 }).call(this);
 (function() {
   Teaspoon.hook = function(name, payload) {
-    var method, xhr, xhrRequest;
+    var xhr, xhrRequest;
     if (payload == null) {
       payload = {};
     }
-    method = "POST";
     xhr = null;
     xhrRequest = function(url, payload, callback) {
       var e;
@@ -941,13 +940,13 @@
 
     viewId = 0;
 
-    function SuiteView(suite1, reporter) {
-      this.suite = suite1;
+    function SuiteView(suite, reporter) {
+      this.suite = suite;
       this.reporter = reporter;
       this.views = this.reporter.views;
       this.suite.viewId = viewId += 1;
       this.views.suites[this.suite.viewId] = this;
-      this.suite = new Teaspoon.Suite(suite);
+      this.suite = new Teaspoon.Suite(this.suite);
       SuiteView.__super__.constructor.apply(this, arguments);
     }
 

data/app/assets/javascripts/teaspoon/base/hook.coffee

@@ -1,5 +1,5 @@
 Teaspoon.hook = (name, payload = {}) ->
-  method = "POST"
+
   xhr = null
 
   xhrRequest = (url, payload, callback) ->

data/app/assets/javascripts/teaspoon/base/reporters/html/suite_view.coffee

@@ -6,7 +6,7 @@ class Teaspoon.Reporters.HTML.SuiteView extends Teaspoon.Reporters.BaseView
     @views = @reporter.views
     @suite.viewId = viewId += 1
     @views.suites[@suite.viewId] = @
-    @suite = new Teaspoon.Suite(suite)
+    @suite = new Teaspoon.Suite(@suite)
     super
 
 

data/lib/generators/teaspoon/install/templates/_boot.html.erb

@@ -1,4 +1,4 @@
-<%= javascript_include_tag *@suite.spec_assets %>
+<%= javascript_include_tag *@suite.spec_assets, debug: @suite.config.expand_assets %>
 <script type="text/javascript">
   Teaspoon.onWindowLoad(Teaspoon.execute);
 </script>

data/lib/teaspoon/engine.rb

@@ -29,11 +29,18 @@ module Teaspoon
       'support/*.js'
     ]
 
+    routes do
+      root to: "suite#index"
+      match "/fixtures/*filename", to: "suite#fixtures", via: :get, as: "fixture"
+      match "/:suite", to: "suite#show", via: :get, as: "suite", defaults: { suite: "default" }
+      match "/:suite/:hook", to: "suite#hook", via: :post, as: "suite_hook", defaults: { suite: "default", hook: "default" }
+    end
+
     initializer :assets, group: :all do |app|
       begin
         Teaspoon::Environment.require_environment
       rescue Teaspoon::EnvironmentNotFound
-        # it's ok for this to fail sometimes, like before the initializer is run etc
+        # it's ok for this to fail sometimes, like before the generator is run etc
       end
 
       Teaspoon::Engine.default_root_path(app.root)           # default the root if it's not set
@@ -71,9 +78,7 @@ module Teaspoon
       return if app.routes.recognize_path(mount_at)[:action] != "routing_error" rescue nil
       require Teaspoon::Engine.root.join("app/controllers/teaspoon/suite_controller")
 
-      app.routes.prepend do
-        mount Teaspoon::Engine => mount_at, as: "teaspoon"
-      end
+      app.routes.prepend { mount Teaspoon::Engine => mount_at, as: "teaspoon" }
     end
   end
 end

data/lib/teaspoon/suite.rb

@@ -101,7 +101,7 @@ module Teaspoon
     end
 
     def glob
-      @glob ||= Dir[config.matcher.present? ? Teaspoon.configuration.root.join(config.matcher) : ""]
+      @glob ||= Dir[config.matcher.present? ? Teaspoon.configuration.root.join(config.matcher) : ""].sort!
     end
 
     def suite_configuration

data/lib/teaspoon/version.rb

@@ -1,3 +1,3 @@
 module Teaspoon
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/dummy/config/boot.rb

@@ -1,3 +1,3 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.

data/spec/features/console_reporter_spec.rb

@@ -9,8 +9,12 @@ feature "testing with teaspoon in the console", aruba: true do
     Teaspoon running default suite at http://127.0.0.1:31337/teaspoon/default
     TypeError: 'undefined' is not a function (evaluating 'foo()')
       # http://127.0.0.1:31337/relative/assets/integration/spec_helper.js:12
-      # http://127.0.0.1:31337/relative/assets/integration/spec_helper.js:14
+    OUTPUT
+    output = all_output.gsub(/127\.0\.0\.1:\d+/, "127.0.0.1:31337")
+    output = output.gsub("undefined is not a constructor", "'undefined' is not a function")
+    assert_partial_output(expected, output)
 
+    expected = <<-OUTPUT.strip_heredoc
     testing console output
     ..FF.*.
 
@@ -34,8 +38,8 @@ feature "testing with teaspoon in the console", aruba: true do
     teaspoon -s default --filter="Integration tests allows failing specs."
     teaspoon -s default --filter="Integration tests allows erroring specs."
     OUTPUT
-    output = all_output.gsub(/Finished in [\d\.]+ seconds/, "Finished in 0.31337 seconds")
-    output = output.gsub(/127\.0\.0\.1:\d+/, "127.0.0.1:31337")
+    output = all_output.gsub(/127\.0\.0\.1:\d+/, "127.0.0.1:31337")
+    output = output.gsub(/Finished in [\d\.]+ seconds/, "Finished in 0.31337 seconds")
     assert_partial_output(expected, output)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - jejacks0n
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -77,7 +77,6 @@ files:
 - app/views/teaspoon/suite/index.html.erb
 - app/views/teaspoon/suite/show.html.erb
 - bin/teaspoon
-- config/routes.rb
 - lib/generators/teaspoon/install/POST_INSTALL
 - lib/generators/teaspoon/install/install_generator.rb
 - lib/generators/teaspoon/install/templates/_body.html.erb
@@ -98,7 +97,6 @@ files:
 - lib/teaspoon.rb
 - lib/teaspoon/command_line.rb
 - lib/teaspoon/configuration.rb
-- lib/teaspoon/configuration.rb.orig
 - lib/teaspoon/console.rb
 - lib/teaspoon/coverage.rb
 - lib/teaspoon/deprecated.rb

data/config/routes.rb

@@ -1,6 +0,0 @@
-Teaspoon::Engine.routes.draw do
-  root to: "suite#index"
-  match "/fixtures/*filename", to: "suite#fixtures", via: :get
-  match "/:suite", as: "suite", to: "suite#show", via: :get, defaults: { suite: "default" }
-  match "/:suite/:hook", as: "suite_hook", to: "suite#hook", via: :post, defaults: { suite: "default", hook: "default" }
-end

data/lib/teaspoon/configuration.rb.orig

@@ -1,187 +0,0 @@
-require "singleton"
-
-module Teaspoon
-  autoload :Formatters, "teaspoon/formatters/base"
-  autoload :Drivers,    "teaspoon/drivers/base"
-
-  class Configuration
-    include Singleton
-
-    # CONTRIBUTORS:
-    # If you add a configuration option you should do the following before it will be considered for merging.
-    # - think about if it should be a suite, coverage, or global configuration
-    # - write specs for it, and add it to existing specs in spec/teaspoon/configuration_spec.rb
-    # - add it to the readme so it's documented
-    # - add it to the command_line.rb if appropriate (_only_ if it's appropriate)
-    # - add it to ENV_OVERRIDES if it can be overridden from ENV
-    # - add it to the initializers in /lib/generators/install/templates so it's documented there as well
-
-    cattr_accessor :mount_at, :root, :asset_paths, :fixture_paths
-    @@mount_at       = "/teaspoon"
-    @@root           = nil # will default to Rails.root
-    @@asset_paths    = ["spec/javascripts", "spec/javascripts/stylesheets", "test/javascripts", "test/javascripts/stylesheets"]
-    @@fixture_paths  = ["spec/javascripts/fixtures", "test/javascripts/fixtures"]
-
-    # console runner specific
-
-    cattr_accessor :driver, :driver_options, :driver_timeout, :server, :server_port, :server_timeout, :fail_fast,
-                   :formatters, :color, :suppress_log,
-                   :use_coverage
-    @@driver         = "phantomjs"
-    @@driver_options = nil
-    @@driver_timeout = 180
-    @@server         = nil
-    @@server_port    = nil
-    @@server_timeout = 20
-    @@fail_fast      = true
-
-    @@formatters     = ["dot"]
-    @@color          = true
-    @@suppress_log   = false
-
-    @@use_coverage   = nil
-
-    # options that can be specified in the ENV
-
-    ENV_OVERRIDES = {
-      boolean: %w(FAIL_FAST SUPPRESS_LOG COLOR),
-      integer: %w(DRIVER_TIMEOUT SERVER_TIMEOUT),
-      string:  %w(DRIVER DRIVER_OPTIONS SERVER SERVER_PORT FORMATTERS USE_COVERAGE)
-    }
-
-    # suite configurations
-
-    cattr_accessor :suite_configs
-    @@suite_configs = { "default" => { block: proc {} } }
-
-    def self.suite(name = :default, &block)
-      @@suite_configs[name.to_s] = { block: block, instance: Suite.new(&block) }
-    end
-
-    class Suite
-      FRAMEWORKS = {
-        jasmine: ["1.3.1", "2.0.0"],
-        mocha: ["1.10.0", "1.17.1"],
-        qunit: ["1.12.0", "1.14.0"],
-      }
-
-      attr_accessor   :matcher, :helper, :javascripts, :stylesheets,
-                      :boot_partial, :body_partial, :no_coverage, :hooks,
-                      :expand_assets
-
-      def initialize
-        @matcher       = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee}"
-        @helper        = "spec_helper"
-        @javascripts   = ["jasmine/1.3.1", "teaspoon-jasmine"]
-        @stylesheets   = ["teaspoon"]
-
-        @boot_partial  = "boot"
-        @body_partial  = "body"
-
-        @no_coverage   = [%r{/lib/ruby/gems/}, %r{/vendor/assets/}, %r{/support/}, %r{/(.+)_helper.}]
-
-<<<<<<< Updated upstream
-        @hooks        = Hash.new { |h, k| h[k] = [] }
-=======
-        @hooks         = Hash.new{ |h, k| h[k] = [] }
-        @expand_assets = true
->>>>>>> Stashed changes
-
-        default = Teaspoon.configuration.suite_configs["default"]
-        instance_eval(&default[:block]) if default
-        yield self if block_given?
-      end
-
-      def use_framework(name, version = nil)
-        name = name.to_sym
-        version ||= FRAMEWORKS[name].last if FRAMEWORKS[name]
-        unless FRAMEWORKS[name] && FRAMEWORKS[name].include?(version)
-          message = "Unknown framework \"#{name}\""
-          if FRAMEWORKS[name] && version
-            message += " with version #{version} -- available versions #{FRAMEWORKS[name].join(', ')}"
-          end
-          raise Teaspoon::UnknownFramework, message
-        end
-
-        @javascripts = [[name, version].join("/"), "teaspoon-#{name}"]
-        case name.to_sym
-        when :qunit
-          @matcher = "{test/javascripts,app/assets}/**/*_test.{js,js.coffee,coffee}"
-          @helper  = "test_helper"
-        end
-      end
-      alias_method :use_framework=, :use_framework
-
-      def hook(group = :default, &block)
-        @hooks[group.to_s] << block
-      end
-    end
-
-    # coverage configurations
-
-    cattr_accessor :coverage_configs
-    @@coverage_configs = { "default" => { block: proc {} } }
-
-    def self.coverage(name = :default, &block)
-      @@coverage_configs[name.to_s] = { block: block, instance: Coverage.new(&block) }
-    end
-
-    class Coverage
-      attr_accessor :reports, :output_path,
-                    :statements, :functions, :branches, :lines
-
-      def initialize
-        @reports      = ["text-summary"]
-        @output_path  = "coverage"
-
-        @statements   = nil
-        @functions    = nil
-        @branches     = nil
-        @lines        = nil
-
-        default = Teaspoon.configuration.coverage_configs["default"]
-        instance_eval(&default[:block]) if default
-        yield self if block_given?
-      end
-    end
-
-    # custom getters / setters
-
-    def self.root=(path)
-      @@root = Pathname.new(path.to_s) if path.present?
-    end
-
-    def self.formatters
-      return ["dot"] if @@formatters.blank?
-      return @@formatters if @@formatters.is_a?(Array)
-      @@formatters.to_s.split(/,\s?/)
-    end
-
-    # override from env or options
-
-    def self.override_from_options(options)
-      options.each { |k, v| override(k, v) }
-    end
-
-    def self.override_from_env(env)
-      ENV_OVERRIDES[:boolean].each { |o| override(o, env[o] == "true") if env[o].present? }
-      ENV_OVERRIDES[:integer].each { |o| override(o, env[o].to_i) if env[o].present? }
-      ENV_OVERRIDES[:string].each  { |o| override(o, env[o]) if env[o].present? }
-    end
-
-    def self.override(config, value)
-      setter = "#{config.to_s.downcase}="
-      send(setter, value) if respond_to?(setter)
-    end
-  end
-
-  mattr_accessor :configured, :configuration
-  @@configured = false
-  @@configuration = Configuration
-
-  def self.configure
-    yield @@configuration
-    @@configured = true
-    @@configuration.override_from_env(ENV)
-  end
-end