newjs 1.5.1 → 1.7.0

data/History.txt

@@ -1,3 +1,14 @@
+== 1.7.0 2009-03-03
+
+* rails/javascript_test: -j/--jshoulda flag to use jshoulda instead of vanilla jsunittest
+* rack/javascript_test: same as rails/javascript_test but for non-rails web apps
+* jshoulda is vendored and copied into project via "rake vendor:update:jshoulda"
+
+== 1.6.0 2008-10-09
+
+* page generator (for newjs_iphone) - creates src/model.js,.css,.html 
+  and test/test_model.html
+
 == 1.5.1 2008-10-09
 
 * Added newsjs_iphone to Manifest for distribution

data/Manifest.txt

@@ -1,7 +1,6 @@
 History.txt
-License.txt
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 app_generators/newjs/USAGE
 app_generators/newjs/newjs_generator.rb
@@ -21,9 +20,7 @@ app_generators/newjs/templates/tasks/deploy.rake
 app_generators/newjs/templates/tasks/environment.rake
 app_generators/newjs/templates/tasks/javascript_test_autotest_tasks.rake
 app_generators/newjs/templates/test/assets/jsunittest.js
-app_generators/newjs/templates/test/assets/prototype.js
 app_generators/newjs/templates/test/assets/unittest.css
-app_generators/newjs/templates/test/assets/unittest.js
 app_generators/newjs_iphone/USAGE
 app_generators/newjs_iphone/newjs_iphone_generator.rb
 app_generators/newjs_iphone/templates/Html/Rakefile.erb
@@ -36,18 +33,21 @@ app_generators/newjs_iphone/templates/Html/script/win_script.cmd
 app_generators/newjs_iphone/templates/Html/src/library.js.erb
 app_generators/newjs_iphone/templates/Html/tasks/javascript_test_autotest_tasks.rake
 app_generators/newjs_iphone/templates/Html/test/assets/jsunittest.js
-app_generators/newjs_iphone/templates/Html/test/assets/prototype.js
 app_generators/newjs_iphone/templates/Html/test/assets/unittest.css
-app_generators/newjs_iphone/templates/Html/test/assets/unittest.js
 bin/newjs
 bin/newjs_iphone
-config/hoe.rb
-config/requirements.rb
+features/development.feature
+features/imported_files_for_generators.feature
+features/steps/common.rb
+features/steps/env.rb
 javascript_test_generators/functional_test/USAGE
 javascript_test_generators/functional_test/functional_test_generator.rb
+javascript_test_generators/functional_test/templates/test/assets/jshoulda.js
 javascript_test_generators/functional_test/templates/test/test.html.erb
 javascript_test_generators/unit_test/USAGE
+javascript_test_generators/unit_test/templates/test/assets/jshoulda.js
 javascript_test_generators/unit_test/templates/test/test.html.erb
+javascript_test_generators/unit_test/templates/test/test_jshoulda.html.erb
 javascript_test_generators/unit_test/unit_test_generator.rb
 lib/newjs.rb
 lib/newjs/autotest.rb
@@ -56,7 +56,6 @@ lib/newjs/autotest/javascript_test_autotest/config.rb
 lib/newjs/autotest/javascript_test_ext.rb
 lib/newjs/jstest.rb
 lib/newjs/rubyforge.rb
-lib/newjs/version.rb
 newjs_generators/install_website/USAGE
 newjs_generators/install_website/install_website_generator.rb
 newjs_generators/install_website/templates/config/website.yml.sample.erb
@@ -65,13 +64,31 @@ newjs_generators/install_website/templates/script/win_script.cmd
 newjs_generators/install_website/templates/tasks/website.rake
 newjs_generators/install_website/templates/website/index.html
 newjs_generators/install_website/templates/website/index.txt
+newjs_iphone_generators/page/USAGE
+newjs_iphone_generators/page/page_generator.rb
+newjs_iphone_generators/page/templates/src/name.css.erb
+newjs_iphone_generators/page/templates/src/name.html.erb
+newjs_iphone_generators/page/templates/src/name.js.erb
+newjs_iphone_generators/page/templates/test/fixtures/name.js.erb
+newjs_iphone_generators/page/templates/test/unit/name_test.html.erb
 newjs_theme_generators/plain_theme/USAGE
 newjs_theme_generators/plain_theme/plain_theme_generator.rb
 newjs_theme_generators/plain_theme/templates/website/javascripts/rounded_corners_lite.inc.js
 newjs_theme_generators/plain_theme/templates/website/stylesheets/screen.css
 newjs_theme_generators/plain_theme/templates/website/template.html.erb
+rack_generators/javascript_test/USAGE
+rack_generators/javascript_test/javascript_test_generator.rb
+rack_generators/javascript_test/templates/assets/jshoulda.js
+rack_generators/javascript_test/templates/assets/jsunittest.js
+rack_generators/javascript_test/templates/assets/unittest.css
+rack_generators/javascript_test/templates/ext/jquery.js
+rack_generators/javascript_test/templates/ext/prototype.js
+rack_generators/javascript_test/templates/library.js.erb
+rack_generators/javascript_test/templates/test.html.erb
+rack_generators/javascript_test/templates/test_jshoulda.html.erb
 rails_generators/javascript_test/USAGE
 rails_generators/javascript_test/javascript_test_generator.rb
+rails_generators/javascript_test/templates/assets/jshoulda.js
 rails_generators/javascript_test/templates/assets/jsunittest.js
 rails_generators/javascript_test/templates/assets/unittest.css
 rails_generators/javascript_test/templates/config/javascript_test_autotest.yml.sample
@@ -89,23 +106,154 @@ rails_generators/javascript_test/templates/script/js_autotest
 rails_generators/javascript_test/templates/script/rstakeout
 rails_generators/javascript_test/templates/script/win_script.cmd
 rails_generators/javascript_test/templates/test.html.erb
+rails_generators/javascript_test/templates/test_jshoulda.html.erb
+script/console
 script/destroy
 script/generate
 script/txt2html
 setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/jsunittest/update.rake
-tasks/website.rake
+tasks/vendor/update/jshoulda.rake
+tasks/vendor/update/jsunittest.rake
 test/test_functional_test_generator.rb
 test/test_generator_helper.rb
 test/test_helper.rb
 test/test_install_website_generator.rb
-test/test_javascript_test_generator.rb
 test/test_newjs_generator.rb
 test/test_newjs_iphone_generator.rb
+test/test_page_generator.rb
 test/test_plain_theme_generator.rb
+test/test_rack_javascript_test.rb
+test/test_rails_javascript_test_generator.rb
 test/test_unit_test_generator.rb
+vendor/jshoulda/History.txt
+vendor/jshoulda/License.txt
+vendor/jshoulda/README.mdown
+vendor/jshoulda/Rakefile
+vendor/jshoulda/config/javascript_test_autotest.yml.sample
+vendor/jshoulda/dist/jshoulda-0.0.1.js
+vendor/jshoulda/dist/jshoulda-0.0.2.js
+vendor/jshoulda/dist/jshoulda-0.0.3.js
+vendor/jshoulda/dist/jshoulda-1.0.1.js
+vendor/jshoulda/dist/jshoulda-1.0.js
+vendor/jshoulda/dist/jshoulda-1.1.js
+vendor/jshoulda/dist/jshoulda-1.2.1.js
+vendor/jshoulda/dist/jshoulda-1.2.js
+vendor/jshoulda/dist/jshoulda-1.2.x.js
+vendor/jshoulda/dist/jshoulda.js
+vendor/jshoulda/jshoulda/test/basic_test.html
+vendor/jshoulda/lib/jstest.rb
+vendor/jshoulda/lib/protodoc.rb
+vendor/jshoulda/script/destroy
+vendor/jshoulda/script/generate
+vendor/jshoulda/script/js_autotest
+vendor/jshoulda/script/rstakeout
+vendor/jshoulda/site/asset_defaults.yaml
+vendor/jshoulda/site/config.yaml
+vendor/jshoulda/site/content/content.html
+vendor/jshoulda/site/content/content.yaml
+vendor/jshoulda/site/content/tutorial/tutorial.html
+vendor/jshoulda/site/content/tutorial/tutorial.yaml
+vendor/jshoulda/site/css/blackboard.css
+vendor/jshoulda/site/css/jshoulda_site.css
+vendor/jshoulda/site/css/unittest.css
+vendor/jshoulda/site/example/minimal.html
+vendor/jshoulda/site/js/editable.js
+vendor/jshoulda/site/layouts/default/default.html
+vendor/jshoulda/site/layouts/default/default.yaml
+vendor/jshoulda/site/layouts/home_test/home_test.js
+vendor/jshoulda/site/layouts/home_test/home_test.yaml
+vendor/jshoulda/site/lib/analytics.rb
+vendor/jshoulda/site/lib/default.rb
+vendor/jshoulda/site/lib/example.rb
+vendor/jshoulda/site/lib/hash.rb
+vendor/jshoulda/site/lib/highlight.rb
+vendor/jshoulda/site/page_defaults.yaml
+vendor/jshoulda/site/templates/default/default.html
+vendor/jshoulda/site/templates/default/default.yaml
+vendor/jshoulda/src/HEADER
+vendor/jshoulda/src/jshoulda.js
+vendor/jshoulda/src/jshoulda.js.erb
+vendor/jshoulda/tasks/bundle.rake
+vendor/jshoulda/tasks/demo.rake
+vendor/jshoulda/tasks/deploy.rake
+vendor/jshoulda/tasks/environment.rake
+vendor/jshoulda/tasks/javascript_test_autotest_tasks.rake
+vendor/jshoulda/tasks/site.rake
+vendor/jshoulda/test/assets/jsunittest.js
+vendor/jshoulda/test/assets/prototype.js
+vendor/jshoulda/test/assets/prototype_unittest.js
+vendor/jshoulda/test/assets/unittest.css
+vendor/jshoulda/test/unit/factory_test.html
+vendor/jshoulda/test/unit/jshoulda2_test.html
+vendor/jshoulda/test/unit/jshoulda_prototype_test.html
+vendor/jshoulda/test/unit/jshoulda_test.html
+vendor/jshoulda/test/unit/merge_methods_test.html
+vendor/jshoulda/test/unit/names_and_count.html
+vendor/jshoulda/test/unit/no_config_test.html
+vendor/jshoulda/test/unit/styles_test.html
+vendor/jshoulda/test/unit/unify_runners.html
+vendor/jshoulda/test/unit/unnamed_context_test.html
+vendor/jsunittest/Capfile
+vendor/jsunittest/History.txt
+vendor/jsunittest/License.txt
+vendor/jsunittest/README.txt
+vendor/jsunittest/Rakefile
+vendor/jsunittest/config/deploy.rb
+vendor/jsunittest/config/website.yml.sample
+vendor/jsunittest/dist/jsunittest-0.7.2.js
+vendor/jsunittest/dist/jsunittest.js
+vendor/jsunittest/dist/unittest.css
+vendor/jsunittest/lib/jstest.rb
+vendor/jsunittest/lib/protodoc.rb
+vendor/jsunittest/script/destroy
+vendor/jsunittest/script/generate
+vendor/jsunittest/script/js_autotest
+vendor/jsunittest/script/rstakeout
+vendor/jsunittest/script/txt2html
+vendor/jsunittest/src/HEADER
+vendor/jsunittest/src/ajax.js
+vendor/jsunittest/src/assertions.js
+vendor/jsunittest/src/common.js
+vendor/jsunittest/src/jsunittest.js
+vendor/jsunittest/src/logger.js
+vendor/jsunittest/src/message_template.js
+vendor/jsunittest/src/orig/unittest.js
+vendor/jsunittest/src/prototype/event.js
+vendor/jsunittest/src/prototype/template.js
+vendor/jsunittest/src/runner.js
+vendor/jsunittest/src/test_case.js
+vendor/jsunittest/tasks/deploy.rake
+vendor/jsunittest/tasks/environment.rake
+vendor/jsunittest/tasks/javascript_test_autotest_tasks.rake
+vendor/jsunittest/tasks/tmbundle.rake
+vendor/jsunittest/tasks/website.rake
+vendor/jsunittest/test/assets/example_test.html
+vendor/jsunittest/test/assets/prototype.js
+vendor/jsunittest/test/assets/unittest.css
+vendor/jsunittest/test/assets/unittest.js
+vendor/jsunittest/test/functional/jsunittest_test.html
+vendor/jsunittest/test/unit/assertions_test.html
+vendor/jsunittest/test/unit/common_test.html
+vendor/jsunittest/test/unit/logger_test.html
+vendor/jsunittest/test/unit/message_template_test.html
+vendor/jsunittest/test/unit/runner_test.html
+vendor/jsunittest/test/unit/template_test.html
+vendor/jsunittest/test/unit/test_case_test.html
+vendor/jsunittest/website/dist/jsunittest-0.7.2.js
+vendor/jsunittest/website/dist/jsunittest-getting-started.tar.gz
+vendor/jsunittest/website/dist/jsunittest-getting-started.zip
+vendor/jsunittest/website/dist/jsunittest-getting-started/assets/jsunittest.js
+vendor/jsunittest/website/dist/jsunittest-getting-started/assets/unittest.css
+vendor/jsunittest/website/dist/jsunittest-getting-started/example_test.html
+vendor/jsunittest/website/dist/jsunittest.js
+vendor/jsunittest/website/images/logo_bundle.png
+vendor/jsunittest/website/images/passing_prototypejs_unittest_tests.jpg
+vendor/jsunittest/website/index.html
+vendor/jsunittest/website/index.txt
+vendor/jsunittest/website/javascripts/rounded_corners_lite.inc.js
+vendor/jsunittest/website/stylesheets/screen.css
+vendor/jsunittest/website/template.html.erb
+vendor/jsunittest/website/tmbundle/JavaScript Unit Testing.tmbundle.tar.gz
 website/images/example-unittest-log.jpg
 website/index.html
 website/index.txt

data/{README.txt → README.rdoc}

@@ -22,7 +22,7 @@ Dr Nic Williams, http://drnicwilliams.com, drnicwilliams@gmail.com
 
 (The MIT License)
 
-Copyright (c) 2008 Dr Nic Williams
+Copyright (c) 2008-2009 Dr Nic Williams
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,4 +1,26 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+require File.dirname(__FILE__) + '/lib/newjs'
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+$hoe = Hoe.new('newjs', Newjs::VERSION) do |p|
+  p.developer('Dr Nic Williams', 'drnicwilliams@gmail.com')
+  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  # p.extra_deps         = [
+  #   ['activesupport','>= 2.0.2'],
+  # ]
+  p.extra_dev_deps = [
+    ['newgem', ">= #{::Newgem::VERSION}"]
+  ]
+  
+  p.clean_globs |= %w[**/.DS_Store tmp *.log]
+  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
+  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
+  p.rsync_args = '-av --delete --ignore-errors'
+end
+
+require 'newgem/tasks' # load /tasks/*.rake
+Dir['tasks/**/*.rake'].each { |t| load t }
+
+# TODO - want other tests/tasks run by default? Add them to the list
+task :default => [:features]

data/app_generators/newjs_iphone/templates/Html/test/assets/jsunittest.js

@@ -1,4 +1,4 @@
-/*  Jsunittest, version 0.6.3
+/*  Jsunittest, version 0.7.2
  *  (c) 2008 Dr Nic Williams
  *
  *  Jsunittest is freely distributable under
@@ -199,7 +199,7 @@ JsUnitTest.gsub.prepareReplacement = function(replacement) {
   return function(match) { return template.evaluate(match) };
 };
 
-JsUnitTest.Version = '0.6.3';
+JsUnitTest.Version = '0.7.2';
 
 JsUnitTest.Template = function(template, pattern) {
   this.template = template; //template.toString();
@@ -441,7 +441,7 @@ JsUnitTest.ajax = function( options ) {
     };
 
     // Create the request object
-    var xml = new XMLHttpRequest();
+    var xml = window.ActiveXObject ? new ActiveXObject('Microsoft.XMLHTTP') : new XMLHttpRequest();
 
     // Open the asynchronous POST request
     xml.open(options.type, options.url, true);
@@ -529,7 +529,7 @@ JsUnitTest.ajax = function( options ) {
         return data;
     }
 
-}
+};
 JsUnitTest.Unit.Assertions = {
   buildMessage: function(message, template) {
     var args = JsUnitTest.arrayfromargs(arguments).slice(2);
@@ -675,7 +675,16 @@ JsUnitTest.Unit.Assertions = {
     this.assertBlock(message, function() { return !(new RegExp(expected).exec(actual)) });
   },
 
+  assertHasClass: function(element, klass, message) {
+    element = JsUnitTest.$(element);
+    message = this.buildMessage(message || 'assertHasClass', '? doesn\'t have class <?>.', element, klass);
+    this.assertBlock(message, function() {
+      return !!element.className.match(new RegExp(klass))
+    });
+  },
+
   assertHidden: function(element, message) {
+    element = JsUnitTest.$(element);
     message = this.buildMessage(message || 'assertHidden', '? isn\'t hidden.', element);
     this.assertBlock(message, function() { return !element.style.display || element.style.display == 'none' });
   },
@@ -822,7 +831,8 @@ JsUnitTest.Unit.Runner.prototype.getResult = function() {
     tests: this.tests.length,
     assertions: 0,
     failures: 0,
-    errors: 0
+    errors: 0,
+    warnings: 0
   };
 
   for (var i=0; i < this.tests.length; i++) {
@@ -830,6 +840,7 @@ JsUnitTest.Unit.Runner.prototype.getResult = function() {
     results.assertions += test.assertions;
     results.failures   += test.failures;
     results.errors     += test.errors;
+    results.warnings   += test.warnings;
   };
   return results;
 };
@@ -840,7 +851,9 @@ JsUnitTest.Unit.Runner.prototype.postResults = function() {
     //   { method: 'get', parameters: this.getResult(), asynchronous: false });
     var results = this.getResult();
     var url = this.options.resultsURL + "?";
+    url += "tests="+ this.tests.length + "&";
     url += "assertions="+ results.assertions + "&";
+    url += "warnings="  + results.warnings + "&";
     url += "failures="  + results.failures + "&";
     url += "errors="    + results.errors;
     JsUnitTest.ajax({
@@ -879,7 +892,7 @@ JsUnitTest.Unit.Runner.prototype.finish = function() {
 };
 
 JsUnitTest.Unit.Runner.prototype.summary = function() {
-  return new JsUnitTest.Template('#{tests} tests, #{assertions} assertions, #{failures} failures, #{errors} errors').evaluate(this.getResult());
+  return new JsUnitTest.Template('#{tests} tests, #{assertions} assertions, #{failures} failures, #{errors} errors, #{warnings} warnings').evaluate(this.getResult());
 };
 JsUnitTest.Unit.Testcase = function(name, test, setup, teardown) {
   this.name           = name;
@@ -895,14 +908,16 @@ for (method in JsUnitTest.Unit.Assertions) {
   JsUnitTest.Unit.Testcase.prototype[method] = JsUnitTest.Unit.Assertions[method];
 }
 
-JsUnitTest.Unit.Testcase.prototype.isWaiting  = false;
-JsUnitTest.Unit.Testcase.prototype.timeToWait = 1000;
-JsUnitTest.Unit.Testcase.prototype.assertions = 0;
-JsUnitTest.Unit.Testcase.prototype.failures   = 0;
-JsUnitTest.Unit.Testcase.prototype.errors     = 0;
-// JsUnitTest.Unit.Testcase.prototype.isRunningFromRake = window.location.port == 4711;
+JsUnitTest.Unit.Testcase.prototype.isWaiting         = false;
+JsUnitTest.Unit.Testcase.prototype.timeToWait        = 1000;
+JsUnitTest.Unit.Testcase.prototype.assertions        = 0;
+JsUnitTest.Unit.Testcase.prototype.failures          = 0;
+JsUnitTest.Unit.Testcase.prototype.errors            = 0;
+JsUnitTest.Unit.Testcase.prototype.warnings          = 0;
 JsUnitTest.Unit.Testcase.prototype.isRunningFromRake = window.location.port;
 
+// JsUnitTest.Unit.Testcase.prototype.isRunningFromRake = window.location.port == 4711;
+
 JsUnitTest.Unit.Testcase.prototype.wait = function(time, nextPart) {
   this.isWaiting = true;
   this.test = nextPart;
@@ -928,7 +943,7 @@ JsUnitTest.Unit.Testcase.prototype.run = function(rethrow) {
 };
 
 JsUnitTest.Unit.Testcase.prototype.summary = function() {
-  var msg = '#{assertions} assertions, #{failures} failures, #{errors} errors\n';
+  var msg = '#{assertions} assertions, #{failures} failures, #{errors} errors, #{warnings} warnings\n';
   return new JsUnitTest.Template(msg).evaluate(this) +
     this.messages.join("\n");
 };
@@ -948,6 +963,18 @@ JsUnitTest.Unit.Testcase.prototype.fail = function(message) {
   this.messages.push("Failure: " + message + (line ? " Line #" + line : ""));
 };
 
+JsUnitTest.Unit.Testcase.prototype.warning = function(message) {
+  this.warnings++;
+  var line = "";
+  try {
+    throw new Error("stack");
+  } catch(e){
+    line = (/\.html:(\d+)/.exec(e.stack || '') || ['',''])[1];
+  }
+  this.messages.push("Warning: " + message + (line ? " Line #" + line : ""));
+};
+JsUnitTest.Unit.Testcase.prototype.warn = JsUnitTest.Unit.Testcase.prototype.warning;
+
 JsUnitTest.Unit.Testcase.prototype.info = function(message) {
   this.messages.push("Info: " + message);
 };
@@ -961,6 +988,7 @@ JsUnitTest.Unit.Testcase.prototype.error = function(error, test) {
 JsUnitTest.Unit.Testcase.prototype.status = function() {
   if (this.failures > 0) return 'failed';
   if (this.errors > 0) return 'error';
+  if (this.warnings > 0) return 'warning';
   return 'passed';
 };
 

data/app_generators/newjs_iphone/templates/Html/test/assets/unittest.css

@@ -40,6 +40,10 @@ body {
   background-color: #fcc;
 }
 
+.logtable .warning {
+  background-color: #FC6;
+}
+
 .logtable td div.action_buttons {
   display: inline;
 }