teabag 0.4.2 → 0.4.3

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

@@ -2072,6 +2072,186 @@
 
   })();
 
+}).call(this);
+(function() {
+  var __slice = [].slice;
+
+  Teabag.fixture = (function() {
+    var addContent, cleanup, create, load, loadComplete, preload, putContent, set, xhr, xhrRequest,
+      _this = this;
+
+    fixture.cache = {};
+
+    fixture.el = null;
+
+    fixture.json = [];
+
+    fixture.preload = function() {
+      var url, urls, _i, _len, _results;
+      urls = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      _results = [];
+      for (_i = 0, _len = urls.length; _i < _len; _i++) {
+        url = urls[_i];
+        _results.push(preload(url));
+      }
+      return _results;
+    };
+
+    fixture.load = function() {
+      var append, index, url, urls, _i, _j, _len, _results;
+      urls = 2 <= arguments.length ? __slice.call(arguments, 0, _i = arguments.length - 1) : (_i = 0, []), append = arguments[_i++];
+      if (append == null) {
+        append = false;
+      }
+      if (typeof append !== "boolean") {
+        urls.push(append);
+        append = false;
+      }
+      _results = [];
+      for (index = _j = 0, _len = urls.length; _j < _len; index = ++_j) {
+        url = urls[index];
+        _results.push(load(url, append || index > 0));
+      }
+      return _results;
+    };
+
+    fixture.set = function() {
+      var append, html, htmls, index, _i, _j, _len, _results;
+      htmls = 2 <= arguments.length ? __slice.call(arguments, 0, _i = arguments.length - 1) : (_i = 0, []), append = arguments[_i++];
+      if (append == null) {
+        append = false;
+      }
+      if (typeof append !== "boolean") {
+        htmls.push(append);
+        append = false;
+      }
+      _results = [];
+      for (index = _j = 0, _len = htmls.length; _j < _len; index = ++_j) {
+        html = htmls[index];
+        _results.push(set(html, append || index > 0));
+      }
+      return _results;
+    };
+
+    fixture.cleanup = function() {
+      return cleanup();
+    };
+
+    function fixture() {
+      Teabag.fixture.load.apply(window, arguments);
+    }
+
+    xhr = null;
+
+    preload = function(url) {
+      return load(url, false, true);
+    };
+
+    load = function(url, append, preload) {
+      var cached, value;
+      if (preload == null) {
+        preload = false;
+      }
+      if (cached = Teabag.fixture.cache[url]) {
+        return loadComplete(url, cached.type, cached.content, append, preload);
+      }
+      value = null;
+      xhrRequest(url, function() {
+        if (xhr.readyState !== 4) {
+          return;
+        }
+        if (xhr.status !== 200) {
+          throw "Unable to load fixture \"" + url + "\".";
+        }
+        return value = loadComplete(url, xhr.getResponseHeader("content-type"), xhr.responseText, append, preload);
+      });
+      return value;
+    };
+
+    loadComplete = function(url, type, content, append, preload) {
+      Teabag.fixture.cache[url] = {
+        type: type,
+        content: content
+      };
+      if (type.match(/application\/json;/)) {
+        return fixture.json[fixture.json.push(JSON.parse(content)) - 1];
+      }
+      if (preload) {
+        return content;
+      }
+      if (append) {
+        addContent(content);
+      } else {
+        putContent(content);
+      }
+      return Teabag.fixture.el;
+    };
+
+    set = function(content, append) {
+      if (append) {
+        return addContent(content);
+      } else {
+        return putContent(content);
+      }
+    };
+
+    putContent = function(content) {
+      cleanup();
+      create();
+      return Teabag.fixture.el.innerHTML = content;
+    };
+
+    addContent = function(content) {
+      if (!Teabag.fixture.el) {
+        create();
+      }
+      return Teabag.fixture.el.innerHTML += content;
+    };
+
+    create = function() {
+      var _ref;
+      Teabag.fixture.el = document.createElement("div");
+      Teabag.fixture.el.id = "teabag-fixtures";
+      return (_ref = document.body) != null ? _ref.appendChild(Teabag.fixture.el) : void 0;
+    };
+
+    cleanup = function() {
+      var _base, _ref, _ref1;
+      (_base = Teabag.fixture).el || (_base.el = document.getElementById("teabag-fixtures"));
+      if ((_ref = Teabag.fixture.el) != null) {
+        if ((_ref1 = _ref.parentNode) != null) {
+          _ref1.removeChild(Teabag.fixture.el);
+        }
+      }
+      return Teabag.fixture.el = null;
+    };
+
+    xhrRequest = function(url, callback) {
+      if (window.XMLHttpRequest) {
+        xhr = new XMLHttpRequest();
+      } else if (window.ActiveXObject) {
+        try {
+          xhr = new ActiveXObject("Msxml2.XMLHTTP");
+        } catch (e) {
+          try {
+            xhr = new ActiveXObject("Microsoft.XMLHTTP");
+          } catch (e) {
+
+          }
+        }
+      }
+      if (!xhr) {
+        throw "Unable to make Ajax Request";
+      }
+      xhr.onreadystatechange = callback;
+      xhr.open("GET", "" + Teabag.root + "/fixtures/" + url, false);
+      return xhr.send();
+    };
+
+    return fixture;
+
+  }).call(this);
+
 }).call(this);
 (function() {
 
@@ -2941,20 +3121,14 @@
 
 }).call(this);
 (function() {
-  var __hasProp = {}.hasOwnProperty,
+  var env, originalReset,
+    __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
   Teabag.Runner = (function(_super) {
-    var env;
 
     __extends(Runner, _super);
 
-    env = QUnit;
-
-    env.config.autostart = false;
-
-    env.config.altertitle = false;
-
     function Runner() {
       Runner.__super__.constructor.apply(this, arguments);
       env.start();
@@ -2976,7 +3150,7 @@
       this.spec = spec;
       this.fullDescription = "" + this.spec.module + " " + this.spec.name;
       this.description = "" + this.spec.name + " (" + this.spec.failed + ", " + this.spec.passed + ", " + this.spec.total + ")";
-      this.link = "?grep=" + (encodeURIComponent(this.fullDescription));
+      this.link = "?grep=" + (encodeURIComponent("" + this.spec.module + ": " + this.spec.name));
       this.parent = this.spec.module ? new Teabag.Suite({
         description: this.spec.module
       }) : null;
@@ -3042,4 +3216,21 @@
 
   })();
 
+  env = QUnit;
+
+  env.config.autostart = false;
+
+  env.config.altertitle = false;
+
+  env.config.filter = Teabag.Runner.prototype.getParams()["grep"];
+
+  window.fixture = Teabag.fixture;
+
+  originalReset = env.reset;
+
+  env.reset = function() {
+    originalReset();
+    return Teabag.fixture.cleanup();
+  };
+
 }).call(this);

data/app/assets/stylesheets/teabag.css

@@ -339,6 +339,7 @@ body.teabag-passed #teabag-progress .teabag-indicator {
   top: 0;
   left: 0;
   width: 10000px;
+  opacity: 0;
 }
 
 /* Responsive

data/app/views/teabag/spec/index.html.erb

@@ -3,25 +3,24 @@
   <head>
     <title>Teabag :: Javascript Test Runner</title>
     <%= stylesheet_link_tag *@suite.stylesheets %>
-    <%= javascript_include_tag_for_teabag *@suite.javascripts %>
     <%= csrf_meta_tags %>
     <meta name="viewport" content="width=device-width, user-scalable=no">
+    <%= javascript_include_tag_for_teabag *@suite.core_javascripts %>
     <script type="text/javascript">
+      // pass relevant info to javascript
+      Teabag.version = <%=raw Teabag::VERSION.inspect %>;
+      Teabag.root = <%=raw Teabag.configuration.mount_at.inspect %>;
+      Teabag.suites = <%=raw @suite.suites.to_json %>;
+
+      // start the execution of the specs (on onload, handling existing onload events)
       window.originalOnload = window.onload;
       window.onload = function() {
         if (window.originalOnload) window.originalOnload();
-
-        // pass relevant info to javascript
-        Teabag.version = <%=raw Teabag::VERSION.inspect %>;
-        Teabag.root = <%=raw Teabag.configuration.mount_at.inspect %>;
-        Teabag.suites = <%=raw @suite.suites.to_json %>;
-
-        // start the execution of the specs
         Teabag.execute();
       }
     </script>
+    <%= javascript_include_tag_for_teabag *@suite.spec_javascripts %>
   </head>
   <body>
-    <div id="teabag-fixtures"></div>
   </body>
 </html>

data/lib/generators/teabag/install/templates/initializer.rb

@@ -1,49 +1,47 @@
 Teabag.setup do |config|
 
-  # This determines where the Teabag spec path will be mounted. Changing this to `"/jasmine"` would allow you to browse
-  # to `http://localhost:3000/jasmine` to run your specs.
+  # This determines where the Teabag routes will be mounted. Changing this to "/jasmine" would allow you to browse to
+  # http://localhost:3000/jasmine to run your specs.
   config.mount_at = "/teabag"
 
-  # The root path defaults to Rails.root if left nil, but if you're testing an engine using a dummy application it's
-  # useful to be able to set this to your engines root.. E.g. `Teabag::Engine.root`
+  # This defaults to Rails.root if left nil. If you're testing an engine using a dummy application it can be useful to
+  # set this to your engines root.. E.g. `Teabag::Engine.root`
   config.root = nil
 
-  # These paths are appended to the rails assets paths (relative to config.root), and by default is an array that you
+  # These paths are appended to the Rails assets paths (relative to config.root), and by default is an array that you
   # can replace or add to.
-  config.asset_paths = ["spec/javascripts", "spec/javascripts/stylesheets"]
+  config.asset_paths = ["spec/javascripts", "spec/javascripts/stylesheets", "test/javascripts", "test/javascripts/stylesheets"]
 
-  # Fixtures are different than the specs, in that Rails is rendering them directly through a controller. This means you
-  # can use haml, erb builder, rabl, etc. to render content in the views available in this path.
+  # Fixtures are rendered through a standard controller. This means you can use things like HAML or RABL/JBuilder, etc.
+  # to generate fixtures within this path.
   config.fixture_path = "spec/javascripts/fixtures"
 
-  # You can modify the default suite configuration or create new suites here. Suites can be entirely isolated from one
-  # another. When defining a suite you can provide a name and a block. If the name is left blank, :default is assumed.
-  # When defining suites, you can omit various directives and the defaults will be used.
+  # You can modify the default suite configuration and create new suites here. Suites can be isolated from one another.
+  # When defining a suite you can provide a name and a block. If the name is left blank, :default is assumed. You can
+  # omit various directives and the defaults will be used.
   #
   # To run a specific suite
   #   - in the browser: http://localhost/teabag/[suite_name]
   #   - from the command line: rake teabag suite=[suite_name]
   config.suite do |suite|
 
-    # You can specify a file matcher for your specs and the matching files will be automatically loaded when the suite
-    # is run. It's important that these files are serve-able from sprockets (aka the asset pipeline).
+    # You can specify a file matcher and all matching files will be loaded when the suite is run. It's important that
+    # these files are serve-able from sprockets.
     #
-    # Note: set to nil if you want to load your spec files using a manifest from within the spec helper file.
+    # Note: Can also be set to nil.
     suite.matcher = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee}"
 
-    # Each suite can load a different spec helper, which can in turn require additional files since this file is also
-    # served via the asset pipeline. This file is loaded before your specs are loaded -- so could potentially include
-    # all of your specs (if you set the matcher to nil).
+    # Each suite can load a different spec helper, which can in turn require additional files. This file is loaded
+    # before your specs are loaded, and can be used as a manifest.
     suite.helper = "spec_helper"
 
-    # These are the core Teabag javascripts. Spec files should not go here -- but if you want to add additional support
-    # for jasmine matchers, switch to mocha, include expectation libraries etc., this is a good place to do that.
+    # These are the core Teabag javascripts. It's strongly encouraged to include only the base files here. You can
+    # require other support libraries in your spec helper, which allows you to change them without having to restart the
+    # server.
     #
-    # To use mocha:
-    #   "teabag-mocha"
+    # Available frameworks: teabag-jasmine, teabag-mocha, teabag-qunit
     #
-    # To use the coffeescript source files:
-    #   "teabag/jasmine" or "teabag/mocha"
+    # Note: To use the CoffeeScript source files use `"teabag/jasmine"` etc.
     suite.javascripts = ["teabag-jasmine"]
 
     # If you want to change how Teabag looks, or include your own stylesheets you can do that here. The default is the
@@ -57,12 +55,12 @@ Teabag.setup do |config|
   #  suite.matcher = "spec/javascripts/targeted/*_spec.{js,js.coffee,coffee}"
   #end
 
-  # When Teabag is run from the rake task these configuration directives apply.
+  # When Teabag is run via the rake task these configuration directives apply.
   #
-  #config.driver = "phantomjs" # or selenium
-  #config.formatters = "dot" # or tap_y, swayze_or_oprah
   #config.server_timeout = 20 # timeout for starting the server
-  #config.fail_fast = true # allow continuing running suites after one has failed
-  #config.suppress_log = false # suppress logs coming from console.[log/error/debug]
+  #config.driver = "phantomjs" # available: phantomjs, selenium
+  #config.formatters = "dot" # available: dot, tap_y, swayze_or_oprah
+  #config.fail_fast = true # stop running suites after one has failures
+  #config.suppress_log = false # suppress logs coming from console[log/error/debug]
 
 end if defined?(Teabag) && Teabag.respond_to?(:setup) # let Teabag be undefined outside of development/test/asset groups

data/lib/teabag/suite.rb

@@ -10,7 +10,15 @@ module Teabag
     end
 
     def javascripts
-      [config.javascripts, helper, specs].flatten
+      [core_javascripts, spec_javascripts].flatten
+    end
+
+    def core_javascripts
+      config.javascripts
+    end
+
+    def spec_javascripts
+      [helper, specs].flatten
     end
 
     def specs

data/lib/teabag/version.rb

@@ -1,3 +1,3 @@
 module Teabag
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end