js-test-driver-rails 0.2.9 → 0.3.0

data/Rakefile

@@ -33,3 +33,5 @@ Jeweler::GemcutterTasks.new
 Jeweler::RubyforgeTasks.new do |rubyforge|
   rubyforge.doc_task = "rdoc"
 end
+
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.3.0

data/lib/js_test_driver/config.rb

@@ -22,7 +22,7 @@ module JsTestDriver
       end
     end
 
-    # Files specified here will not be loaded, it's useful when combined with globbing in includes 
+    # Files specified here will not be loaded, it's useful when combined with globbing in includes
     #
     # paths should be relative to root_dir
     def excludes(*paths)
@@ -35,7 +35,7 @@ module JsTestDriver
     #
     # This should be a string with no spaces (if you need to pass parameters to the browser you will
     # need to create a shell script ans put it's name here)
-    def browser(browsers)
+    def browser(*browsers)
       browsers.each do |browser|
         self.browsers << browser
       end
@@ -50,12 +50,12 @@ module JsTestDriver
     # namespace.name["file_name_without the html extension"]
     #
     # by default the namespace is called htmlFixtures
-    # and the fixture name is called all     
+    # and the fixture name is called all
     def fixtures(directory, opts = {})
       fixture = JsTestDriver::HtmlFixture.new(directory, opts[:name], opts[:namespace])
       if html_fixtures.detect{|f| f.name == fixture.name && f.namespace == fixture.namespace}
         raise ArgumentError.new("Fixture #{fixture.namespace}.#{fixture.name} already defined!")
-      end  
+      end
       html_fixtures << fixture
     end
 
@@ -186,7 +186,7 @@ module JsTestDriver
       values.each do |attr, value|
         self.send("#{attr}=", value)
       end
-    end 
+    end
 
   end
-end
+end

data/vendor/VERSIONS

@@ -1,3 +1,3 @@
-JsTestDriver: 1.2.2
-Jasmine: 0.11.1
-JasmineAdapter: http://github.com/mhevery/jasmine-jstd-adapter/commit/30249606deefc81798dd82cb0b0a34d2f14a3928
+JsTestDriver: 1.3.2
+Jasmine: 1.0.1
+JasmineAdapter: http://github.com/mhevery/jasmine-jstd-adapter/commit/66fd298eac4364a02f80cc7d0714adcdffbe175e

data/vendor/jasmine-jstd-adapter/jsTestDriverIit.conf

@@ -0,0 +1,6 @@
+server: http://localhost:9876
+
+load:
+  - lib/jasmine/*.js
+  - src/*.js
+  - src-test/iit/*.js

data/vendor/jasmine-jstd-adapter/src-test/iit/iitSpec.js

@@ -0,0 +1,46 @@
+(function() {
+  var specs = [];
+
+
+  describe('root describe', function() {
+    it('nested it', function() {
+      specs.push('nested it');
+    });
+  });
+
+
+  describe('root describe with iit', function() {
+    it('it as iit sibling', function() {
+      specs.push('it as iit sibling');
+    });
+
+    iit('nested iit', function() {
+      specs.push('nested iit');
+    });
+  });
+
+
+  describe('describe that follows iit with a nested it', function() {
+    it('nested it after iit', function() {
+      specs.push('nested it after iit');
+    });
+  });
+  
+
+  describe('describe with iit followed by it', function() {
+    iit('iit that preceeds an it', function() {
+      specs.push('iit that preceeds an it');
+    });
+
+    it('it that follows an iit', function() {
+      specs.push('it that follows an iit');
+    });
+  });
+
+
+  describe('test summary', function() {
+    iit('should have executed all iit tests and nothing else', function() {
+      expect(specs).toEqual(['nested iit', 'iit that preceeds an it']);
+    });
+  });
+})();

data/vendor/jasmine-jstd-adapter/src/JasmineAdapter.js

@@ -1,111 +1,186 @@
 /**
  * @fileoverview Jasmine JsTestDriver Adapter.
- * @author ibolmo@gmail.com (Olmo Maldonado)
  * @author misko@hevery.com (Misko Hevery)
  */
-
-(function() {
-
-  function bind(_this, _function){
-    return function(){
-      return _function.call(_this);
-    };
-  }
-
-  var currentFrame = frame(null, null);
-
-  function frame(parent, name){
-    var caseName = (parent && parent.caseName ? parent.caseName + " " : '') + (name ? name : '');
-    var frame = {
-      name: name,
-      caseName: caseName,
-      parent: parent,
-      testCase: TestCase(caseName),
-      before: [],
-      after: [],
-      runBefore: function(){
-        if (parent) parent.runBefore.apply(this);
-        for ( var i = 0; i < frame.before.length; i++) {
-          frame.before[i].apply(this);
-        }
+(function(window) {
+  var rootDescribes = new Describes(window);
+  var describePath = [];
+  rootDescribes.collectMode();
+
+  var jasmineTest = TestCase('Jasmine Adapter Tests', null, 'jasmine test case');
+
+  var jasminePlugin = {
+      name:'jasmine',
+      runTestConfiguration: function(testRunConfiguration, onTestDone, onTestRunConfigurationComplete){
+        if (testRunConfiguration.testCaseInfo_.template_ !== jasmineTest) return;
+
+        var jasmineEnv = jasmine.currentEnv_ = new jasmine.Env();
+        rootDescribes.playback();
+        var specLog = jstestdriver.console.log_ = [];
+        var start;
+        jasmineEnv.specFilter = function(spec) {
+          return rootDescribes.isExclusive(spec);
+        };
+        jasmineEnv.reporter = {
+          log: function(str){
+            specLog.push(str);
+          },
+
+          reportRunnerStarting: function(runner) { },
+
+          reportSpecStarting: function(spec) {
+            specLog = jstestdriver.console.log_ = [];
+            start = new Date().getTime();
+          },
+
+          reportSpecResults: function(spec) {
+            var suite = spec.suite;
+            var results = spec.results();
+            if (results.skipped) return;
+            var end = new Date().getTime();
+            var messages = [];
+            var resultItems = results.getItems();
+            var state = 'passed';
+            for ( var i = 0; i < resultItems.length; i++) {
+              if (!resultItems[i].passed()) {
+                state = resultItems[i].message.match(/AssertionError:/) ? 'error' : 'failed';
+                messages.push({
+                  message: resultItems[i].toString(),
+                  name: resultItems[i].trace.name,
+                  stack: formatStack(resultItems[i].trace.stack)
+              });
+              }
+            }
+            onTestDone(
+              new jstestdriver.TestResult(
+                suite.getFullName(),
+                spec.description,
+                state,
+                jstestdriver.angular.toJson(messages),
+                specLog.join('\n'),
+                end - start));
+          },
+
+          reportSuiteResults: function(suite) {},
+
+          reportRunnerResults: function(runner) {
+            onTestRunConfigurationComplete();
+          }
+        };
+        jasmineEnv.execute();
+        return true;
       },
-      runAfter: function(){
-        for ( var i = 0; i < frame.after.length; i++) {
-          frame.after[i].apply(this);
-        }
-        if (parent) parent.runAfter.apply(this);
+      onTestsFinish: function(){
+        jasmine.currentEnv_ = null;
+        rootDescribes.collectMode();
       }
-    };
-    return frame;
   };
+  jstestdriver.pluginRegistrar.register(jasminePlugin);
+
+  function formatStack(stack) {
+    var lines = (stack||'').split(/\r?\n/);
+    var frames = [];
+    for (i = 0; i < lines.length; i++) {
+      if (!lines[i].match(/\/jasmine[\.-]/)) {
+        frames.push(lines[i].replace(/https?:\/\/\w+(:\d+)?\/test\//, '').replace(/^\s*/, '      '));
+      }
+    }
+    return frames.join('\n');
+  }
 
-  jasmine.Env.prototype.describe = (function(describe){
-    return function(description){
-      currentFrame = frame(currentFrame, description);
-      var val = describe.apply(this, arguments);
-      currentFrame = currentFrame.parent;
-      return val;
-    };
-
-  })(jasmine.Env.prototype.describe);
-
-  var id = 0;
-
-  jasmine.Env.prototype.it = (function(it){
-    return function(desc, itFn){
-      var self = this;
-      var spec = it.apply(this, arguments);
-      var currentSpec = this.currentSpec;
-      if (!currentSpec.$id) {
-        currentSpec.$id = id++;
+  function noop(){}
+  function Describes(window){
+    var describes = {};
+    var beforeEachs = {};
+    var afterEachs = {};
+    // Here we store:
+    // 0: everyone runs
+    // 1: run everything under ddescribe
+    // 2: run only iits (ignore ddescribe)
+    var exclusive = 0;
+    var collectMode = true;
+    intercept('describe', describes);
+    intercept('xdescribe', describes);
+    intercept('beforeEach', beforeEachs);
+    intercept('afterEach', afterEachs);
+
+    function intercept(functionName, collection){
+      window[functionName] = function(desc, fn){
+        if (collectMode) {
+          collection[desc] = function(){
+            jasmine.getEnv()[functionName](desc, fn);
+          };
+        } else {
+          jasmine.getEnv()[functionName](desc, fn);
+        }
+      };
+    }
+    window.ddescribe = function(name, fn){
+      if (exclusive < 1) {
+        exclusive = 1; // run ddescribe only
       }
-      var frame = this.jstdFrame = currentFrame;
-      var name = 'test that it ' + desc;
-      if (this.jstdFrame.testCase.prototype[name])
-        throw "Spec with name '" + desc + "' already exists.";
-      this.jstdFrame.testCase.prototype[name] = function(){
-        jasmine.getEnv().currentSpec = currentSpec;
-        frame.runBefore.apply(currentSpec);
+      window.describe(name, function(){
+        var oldIt = window.it;
+        window.it = function(name, fn){
+          fn.exclusive = 1; // run anything under ddescribe
+          jasmine.getEnv().it(name, fn);
+        };
         try {
-          currentSpec.queue.start();
+          fn.call(this);
         } finally {
-          frame.runAfter.apply(currentSpec);
-        }
-      };
-      return spec;
+          window.it = oldIt;
+        };
+      });
     };
-
-  })(jasmine.Env.prototype.it);
-
-
-  jasmine.Env.prototype.beforeEach = (function(beforeEach){
-    return function(beforeEachFunction) {
-      beforeEach.apply(this, arguments);
-      currentFrame.before.push(beforeEachFunction);
+    window.iit = function(name, fn){
+      exclusive = fn.exclusive = 2; // run only iits
+      jasmine.getEnv().it(name, fn);
     };
 
-  })(jasmine.Env.prototype.beforeEach);
-
 
-  jasmine.Env.prototype.afterEach = (function(afterEach){
-    return function(afterEachFunction) {
-      afterEach.apply(this, arguments);
-      currentFrame.after.push(afterEachFunction);
+    this.collectMode = function() {
+      collectMode = true;
+      exclusive = 0; // run everything
     };
-
-  })(jasmine.Env.prototype.afterEach);
-
-
-  jasmine.NestedResults.prototype.addResult = (function(addResult){
-    return function(result) {
-      addResult.call(this, result);
-      if (result.type != 'MessageResult' && !result.passed()) fail(result.message);
+    this.playback = function(){
+      collectMode = false;
+      playback(beforeEachs);
+      playback(afterEachs);
+      playback(describes);
+
+      function playback(set) {
+        for ( var name in set) {
+          set[name]();
+        }
+      }
     };
 
-  })(jasmine.NestedResults.prototype.addResult);
+    this.isExclusive = function(spec) {
+      if (exclusive) {
+        var blocks = spec.queue.blocks;
+        for ( var i = 0; i < blocks.length; i++) {
+          if (blocks[i].func.exclusive >= exclusive) {
+            return true;
+          }
+        }
+        return false;
+      }
+      return true;
+    };
+  }
 
-  // Reset environment with overriden methods.
-  jasmine.currentEnv_ = null;
-  jasmine.getEnv();
+})(window);
+
+// Patch Jasmine for proper stack traces
+jasmine.Spec.prototype.fail = function (e) {
+  var expectationResult = new jasmine.ExpectationResult({
+    passed: false,
+    message: e ? jasmine.util.formatException(e) : 'Exception'
+  });
+  // PATCH
+  if (e) {
+    expectationResult.trace = e;
+  }
+  this.results_.addResult(expectationResult);
+};
 
-})();

data/vendor/jasmine-jstd-adapter/test-iit.sh

@@ -0,0 +1 @@
+java -jar lib/jstestdriver/JsTestDriver.jar --config jsTestDriverIit.conf --tests "all" --reset

data/vendor/jasmine-jstd-adapter/test-regular.sh

@@ -0,0 +1,2 @@
+java -jar lib/jstestdriver/JsTestDriver.jar --tests 'all' --reset
+java -jar lib/jstestdriver/JsTestDriver.jar --tests 'all'

data/vendor/jasmine-jstd-adapter/test.sh

@@ -1 +1,2 @@
-java -jar lib/jstestdriver/JsTestDriver.jar --tests all --reset
+source test-regular.sh
+source test-iit.sh

data/vendor/jasmine/Rakefile

@@ -91,8 +91,9 @@ jasmine.version_= {
     FileUtils.cp("src/html/jasmine.css", "lib/jasmine.css")
   end
 
+  downloads_file = 'pages/download.html.md'
   task :need_pages_submodule do
-    unless File.exists?('pages/index.html')
+    unless File.exists?(downloads_file)
       raise "Jasmine pages submodule isn't present.  Run git submodule update --init"
     end
   end
@@ -109,6 +110,8 @@ jasmine.version_= {
       t[:files] = jasmine_sources << jasmine_html_sources
       t[:options] = "-a"
       t[:out] = "pages/jsdoc"
+      # JsdocHelper bug: template must be relative to the JsdocHelper gem, ick
+      t[:template] = File.join("../".*(100), Dir::getwd, "jsdoc-template")
     end
     Rake::Task[:lambda_jsdoc].invoke
   end
@@ -131,7 +134,8 @@ jasmine.version_= {
     {
         "lib/jasmine.js" => "jasmine.js",
         "lib/jasmine-html.js" => "jasmine-html.js",
-        "src/html/jasmine.css" => "jasmine.css"
+        "src/html/jasmine.css" => "jasmine.css",
+        "MIT.LICENSE"  => "MIT.LICENSE"
     }.each_pair do |src, dest|
       FileUtils.cp(File.join(root, src), File.join(lib_dir, dest))
     end
@@ -151,26 +155,26 @@ jasmine.version_= {
     require 'digest/sha1'
 
     download_html = "<!-- START_DOWNLOADS -->\n"
-    download_html += "<table>\n<tr><th></th><th>Version</th><th>Size</th><th>Date</th><th>SHA1</th></tr>\n"
     Dir.glob('pages/downloads/*.zip').sort.reverse.each do |f|
       sha1 = Digest::SHA1.hexdigest File.read(f)
 
       fn = f.sub(/^pages\//, '')
       version = /jasmine-standalone-(.*).zip/.match(f)[1]
-      download_html += "<tr>\n"
-      download_html += "<td class=\"link\"><a href='#{fn}'>#{fn.sub(/downloads\//, '')}</a></td>\n"
-      download_html += "<td class=\"version\">#{version}</td>\n"
-      download_html += "<td class=\"size\">#{File.size(f) / 1024}k</td>\n"
-      download_html += "<td class=\"date\">#{File.mtime(f).strftime("%Y/%m/%d %H:%M:%S %Z")}</td>\n"
-      download_html += "<td class=\"sha\">#{sha1}</td>\n"
+      prerelease = /\.rc/.match(f)
+      download_html += prerelease ? "<tr class=\"rc\">\n" : "<tr>\n"
+      download_html += "  <td class=\"link\"><a href=\"#{fn}\">#{fn.sub(/downloads\//, '')}</a></td>\n"
+      download_html += "  <td class=\"version\">#{version}</td>\n"
+      download_html += "  <td class=\"size\">#{File.size(f) / 1024}k</td>\n"
+      download_html += "  <td class=\"date\">#{File.mtime(f).strftime("%Y/%m/%d %H:%M:%S %Z")}</td>\n"
+      download_html += "  <td class=\"sha\">#{sha1}</td>\n"
       download_html += "</tr>\n"
     end
-    download_html += "</table>\n<!-- END_DOWNLOADS -->"
+    download_html += "<!-- END_DOWNLOADS -->"
 
-    index_page = File.read('pages/index.html')
+    downloads_page = File.read(downloads_file)
     matcher = /<!-- START_DOWNLOADS -->.*<!-- END_DOWNLOADS -->/m
-    index_page = index_page.sub(matcher, download_html)
-    File.open('pages/index.html', 'w') {|f| f.write(index_page)}
+    downloads_page = downloads_page.sub(matcher, download_html)
+    File.open(downloads_file, 'w') {|f| f.write(downloads_page)}
     puts "rewrote that file"
   end
 end