js-test-driver-rails 0.4.3 → 0.5.0.pre1

data/test/unit/run_test.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+module JsTestDriver
+  class RunTest < Test::Unit::TestCase
+
+    def test_should_run_with_all_arguments_at_once
+      config.browser 'foo', 'bar', 'baz'
+
+      application.run(:tests => 'TestCase',
+                      :browsers => 'aaa,bbb',
+                      :output_xml => true,
+                      :capture_console => true)
+
+      assert_run("java -jar #{runtime_config.jar_path} --serverHandlerPrefix jstd --port 4224 --config #{runtime_config.config_yml_path} --browser aaa,bbb --tests TestCase --testOutput #{runtime_config.test_xml_data_path} --captureConsole")
+    end
+
+    def test_when_measuring_coverage
+      config.measure_coverage
+      config.browser 'foo'
+
+      application.run(:output_xml => true)
+
+      assert_run("genhtml -o #{runtime_config.coverage_files_path} #{runtime_config.coverage_data_file}")
+    end
+
+  end
+end
+

data/test/unit/run_tests_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+module JsTestDriver
+  class RunTestsTest < Test::Unit::TestCase
+
+    def test_should_run_all_tests_by_default
+      application.run_tests
+
+      assert_run("java -jar #{runtime_config.jar_path} --serverHandlerPrefix jstd --config #{runtime_config.config_yml_path} --tests all")
+    end
+
+    def test_should_run_selected_tests
+      application.run_tests(:tests => 'MyTestCase.some_test')
+
+      assert_run("java -jar #{runtime_config.jar_path} --serverHandlerPrefix jstd --config #{runtime_config.config_yml_path} --tests MyTestCase.some_test")
+    end
+
+  end
+end
+

data/test/unit/runtime_config_test.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+module JsTestDriver
+  class RuntimeConfigTest < Test::Unit::TestCase
+
+    def test_should_have_default_config_path
+      assert application.runtime_config.config_path
+    end
+
+    def test_should_have_default_jar_path
+      assert application.runtime_config.jar_path
+    end
+
+    def test_should_have_default_tmp_path
+      assert application.runtime_config.config_yml_path
+    end
+
+  end
+end

data/test/unit/start_server_test.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+module JsTestDriver
+  class StartServerTest < Test::Unit::TestCase
+
+    def test_should_run_server_with_given_port_number
+      application.config.port(6666)
+
+      application.start_server
+
+      assert_run("java -jar #{runtime_config.jar_path} --serverHandlerPrefix jstd --port #{config.port}")
+    end
+
+  end
+end

data/vendor/JasmineAdapter.js

@@ -108,14 +108,15 @@ describe = intercept('describe');
 beforeEach = intercept('beforeEach');
 afterEach = intercept('afterEach');
 
-var template = TestCase('Jasmine Adapter Tests', null, 'jasmine test case');
+var JASMINE_TYPE = 'jasmine test case';
+TestCase('Jasmine Adapter Tests', null, JASMINE_TYPE);
 
 jstestdriver.pluginRegistrar.register({
 
 	name: 'jasmine',
 
 	runTestConfiguration: function(config, onTestDone, onComplete){
-		if (config.testCaseInfo_.template_ !== template) return;
+		if (config.getTestCaseInfo().getType() != JASMINE_TYPE) return false;
 		(jasmine.currentEnv_ = new Env(onTestDone, onComplete)).execute();
 		return true;
 	},

data/vendor/jasmine.js

@@ -22,6 +22,12 @@ jasmine.unimplementedMethod_ = function() {
  */
 jasmine.undefined = jasmine.___undefined___;
 
+/**
+ * Show diagnostic messages in the console if set to true
+ *
+ */
+jasmine.VERBOSE = false;
+
 /**
  * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed.
  *
@@ -74,7 +80,7 @@ jasmine.MessageResult = function(values) {
 
 jasmine.MessageResult.prototype.toString = function() {
   var text = "";
-  for(var i = 0; i < this.values.length; i++) {
+  for (var i = 0; i < this.values.length; i++) {
     if (i > 0) text += " ";
     if (jasmine.isString_(this.values[i])) {
       text += this.values[i];
@@ -91,9 +97,10 @@ jasmine.ExpectationResult = function(params) {
   this.passed_ = params.passed;
   this.expected = params.expected;
   this.actual = params.actual;
-
   this.message = this.passed_ ? 'Passed.' : params.message;
-  this.trace = this.passed_ ? '' : new Error(this.message);
+
+  var trace = (params.trace || new Error(this.message));
+  this.trace = this.passed_ ? '' : trace;
 };
 
 jasmine.ExpectationResult.prototype.toString = function () {
@@ -119,7 +126,7 @@ jasmine.getEnv = function() {
  * @returns {Boolean}
  */
 jasmine.isArray_ = function(value) {
-  return jasmine.isA_("Array", value);  
+  return jasmine.isA_("Array", value);
 };
 
 /**
@@ -587,17 +594,25 @@ jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() {
     try {
       return f();
     } catch(e) {
-    }    
+    }
     return null;
   }
-  
-  var xhr = tryIt(function(){return new ActiveXObject("Msxml2.XMLHTTP.6.0");}) ||
-            tryIt(function(){return new ActiveXObject("Msxml2.XMLHTTP.3.0");}) ||
-            tryIt(function(){return new ActiveXObject("Msxml2.XMLHTTP");}) ||
-            tryIt(function(){return new ActiveXObject("Microsoft.XMLHTTP");});
+
+  var xhr = tryIt(function() {
+    return new ActiveXObject("Msxml2.XMLHTTP.6.0");
+  }) ||
+    tryIt(function() {
+      return new ActiveXObject("Msxml2.XMLHTTP.3.0");
+    }) ||
+    tryIt(function() {
+      return new ActiveXObject("Msxml2.XMLHTTP");
+    }) ||
+    tryIt(function() {
+      return new ActiveXObject("Microsoft.XMLHTTP");
+    });
 
   if (!xhr) throw new Error("This browser does not support XMLHttpRequest.");
-  
+
   return xhr;
 } : XMLHttpRequest;
 /**
@@ -773,14 +788,14 @@ jasmine.Env.prototype.describe = function(description, specDefinitions) {
     declarationError = e;
   }
 
-  this.currentSuite = parentSuite;
-
   if (declarationError) {
     this.it("encountered a declaration exception", function() {
       throw declarationError;
     });
   }
 
+  this.currentSuite = parentSuite;
+
   return suite;
 };
 
@@ -1318,13 +1333,13 @@ jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
     if (this.actual.callCount === 0) {
       // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw]
       return [
-        "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
-        "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
+        "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
+        "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
       ];
     } else {
       return [
-        "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
-        "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
+        "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
+        "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
       ];
     }
   };
@@ -1379,6 +1394,23 @@ jasmine.Matchers.prototype.toBeGreaterThan = function(expected) {
   return this.actual > expected;
 };
 
+/**
+ * Matcher that checks that the expected item is equal to the actual item
+ * up to a given level of decimal precision (default 2).
+ *
+ * @param {Number} expected
+ * @param {Number} precision
+ */
+jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) {
+  if (!(precision === 0)) {
+    precision = precision || 2;
+  }
+  var multiplier = Math.pow(10, precision);
+  var actual = Math.round(this.actual * multiplier);
+  expected = Math.round(expected * multiplier);
+  return expected == actual;
+};
+
 /**
  * Matcher that checks that the expected exception was thrown by the actual.
  *
@@ -1976,7 +2008,8 @@ jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessag
 jasmine.Spec.prototype.fail = function (e) {
   var expectationResult = new jasmine.ExpectationResult({
     passed: false,
-    message: e ? jasmine.util.formatException(e) : 'Exception'
+    message: e ? jasmine.util.formatException(e) : 'Exception',
+    trace: { stack: e.stack }
   });
   this.results_.addResult(expectationResult);
 };
@@ -2186,7 +2219,9 @@ jasmine.WaitsBlock = function(env, timeout, spec) {
 jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block);
 
 jasmine.WaitsBlock.prototype.execute = function (onComplete) {
-  this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...');
+  if (jasmine.VERBOSE) {
+    this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...');
+  }
   this.env.setTimeout(function () {
     onComplete();
   }, this.timeout);
@@ -2214,7 +2249,9 @@ jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block);
 jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10;
 
 jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
-  this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
+  if (jasmine.VERBOSE) {
+    this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
+  }
   var latchFunctionResult;
   try {
     latchFunctionResult = this.latchFunction.apply(this.spec);
@@ -2429,7 +2466,7 @@ jasmine.getGlobal().clearInterval = function(timeoutKey) {
 
 jasmine.version_= {
   "major": 1,
-  "minor": 0,
-  "build": 2,
-  "revision": 1299565706
+  "minor": 1,
+  "build": 0,
+  "revision": 1307546962
 };

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: js-test-driver-rails
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.3
+  prerelease: 6
+  version: 0.5.0.pre1
 platform: ruby
 authors: 
 - Adam Pohorecki
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 Z
+date: 2011-06-09 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -35,7 +36,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: commander
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -43,13 +44,35 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: selenium-webdriver
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Use ruby to configure JsTestDriver, capture browsers and run tests.
 email: 
 - adam@pohorecki.pl
-executables: []
-
+executables: 
+- jstd
 extensions: []
 
 extra_rdoc_files: []
@@ -62,11 +85,25 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
+- TODO
+- bin/jstd
 - js-test-driver-rails.gemspec
 - lib/js_test_driver.rb
+- lib/js_test_driver/application.rb
+- lib/js_test_driver/cli/capture_browsers.rb
+- lib/js_test_driver/cli/run.rb
+- lib/js_test_driver/cli/run_tests.rb
+- lib/js_test_driver/cli/start_server.rb
+- lib/js_test_driver/commands/base_command.rb
+- lib/js_test_driver/commands/generate_coverage_report.rb
+- lib/js_test_driver/commands/jstd_jar_command.rb
 - lib/js_test_driver/config.rb
+- lib/js_test_driver/config_factory.rb
 - lib/js_test_driver/html_fixture.rb
+- lib/js_test_driver/missing_dependency_error.rb
+- lib/js_test_driver/remote_browser.rb
 - lib/js_test_driver/runner.rb
+- lib/js_test_driver/runtime_config.rb
 - lib/js_test_driver/tasks.rb
 - lib/js_test_driver/version.rb
 - test/fixtures/a.html
@@ -82,14 +119,19 @@ files:
 - test/sample/specs/calculator_spec.js
 - test/sample/specs/spec_helper.js
 - test/test_helper.rb
+- test/unit/capture_browsers_test.rb
 - test/unit/config_test.rb
 - test/unit/html_fixture_test.rb
-- test/unit/runner_test.rb
+- test/unit/run_test.rb
+- test/unit/run_tests_test.rb
+- test/unit/runtime_config_test.rb
+- test/unit/start_server_test.rb
 - vendor/JasmineAdapter.js
 - vendor/VERSIONS
 - vendor/coverage.jar
 - vendor/jasmine.js
 - vendor/js_test_driver.jar
+has_rdoc: true
 homepage: http://github.com/psyho/js-test-driver-rails
 licenses: []
 
@@ -107,13 +149,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: js-test-driver-rails
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A wrapper for JsTestDriver for use with ruby/rails projects

data/test/unit/runner_test.rb

@@ -1,107 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
-
-module JsTestDriver
-  class RunnerTest < Test::Unit::TestCase
-
-    def given_a_runner(opts = {})
-      return JsTestDriver::Runner.new(opts)
-    end
-
-    def test_should_have_default_config_path
-      # given
-      runner = given_a_runner
-
-      # then
-      assert runner.config_path
-    end
-
-    def test_should_have_default_jar_path
-      # given
-      runner = given_a_runner
-
-      # then
-      assert runner.jar_path
-    end
-
-    def test_should_have_default_tmp_path
-      # given
-      runner = given_a_runner
-
-      # then
-      assert runner.config_yml_path
-    end
-
-    def expect_command_to_be_executed(cmd)
-      JsTestDriver::Runner::Command.any_instance.expects(:system).with(cmd)
-    end
-
-    def expect_spawn(cmd)
-      JsTestDriver::Runner.any_instance.expects(:spawn).with(cmd)
-    end
-
-    def test_should_run_server_with_given_port_number
-      config = JsTestDriver::Config.new(:port => 6666)
-      runner = given_a_runner(:config => config)
-
-      expect_command_to_be_executed("java -jar #{runner.jar_path} --port #{config.port}")
-
-      runner.start_server
-    end
-
-    def test_should_run_all_tests_by_default
-      runner = given_a_runner(:config => JsTestDriver::Config.new)
-
-      expect_command_to_be_executed("java -jar #{runner.jar_path} --config #{runner.config_yml_path} --tests all")
-
-      runner.run_tests
-    end
-
-    def test_should_run_selected_tests
-      runner = given_a_runner(:config => JsTestDriver::Config.new)
-
-      expect_command_to_be_executed("java -jar #{runner.jar_path} --config #{runner.config_yml_path} --tests MyTestCase.some_test")
-
-      runner.run_tests('MyTestCase.some_test')
-    end
-
-    def test_should_capture_default_browsers
-      runner = given_a_runner(:config => JsTestDriver::Config.new(:browsers => ['foo', 'bar', 'baz']))
-
-      ['foo', 'bar', 'baz'].each do |browser|
-        expect_spawn("#{browser} 'http://localhost:4224/capture'")
-      end
-
-      runner.capture_browsers
-    end
-
-    def test_should_capture_given_browsers
-      runner = given_a_runner(:config => JsTestDriver::Config.new(:browsers => ['foo', 'bar', 'baz']))
-
-      ['aaa', 'bbb'].each do |browser|
-        expect_spawn("#{browser} 'http://localhost:4224/capture'")
-      end
-
-      runner.capture_browsers('aaa,bbb')
-    end
-
-    def test_should_run_with_all_arguments_at_once
-      runner = given_a_runner(:config => JsTestDriver::Config.new(:browsers => ['foo', 'bar', 'baz']))
-
-      expect_command_to_be_executed("java -jar #{runner.jar_path} --port 4224 --config #{runner.config_yml_path} --browser aaa,bbb --tests TestCase --testOutput #{File.expand_path('.js_test_driver')} --captureConsole")
-
-      runner.start_server_capture_and_run('TestCase', 'aaa,bbb', '.js_test_driver', true)
-    end
-
-    def test_when_measuring_coverage
-      config = JsTestDriver::Config.new
-      config.measure_coverage
-      runner = given_a_runner(:config => config)
-
-      JsTestDriver::Runner::Command.any_instance.expects(:system)
-      runner.expects(:system).with("genhtml -o #{File.expand_path('.js_test_driver/coverage')} #{File.expand_path('.js_test_driver/jsTestDriver.conf-coverage.dat')}")
-
-      runner.start_server_capture_and_run(nil, 'aaa', '.js_test_driver')
-    end
-
-  end
-end