newjs 1.7.2 → 1.7.4

data/vendor/jsunittest/src/logger.js

@@ -1,10 +1,10 @@
 JsUnitTest.Unit.Logger = function(element) {
   this.element = JsUnitTest.$(element);
-  if (this.element) this._createLogTable();
+  if (this.element) {this._createLogTable();}
 };
   
 JsUnitTest.Unit.Logger.prototype.start = function(testName) {
-  if (!this.element) return;
+  if (!this.element) {return;}
   var tbody = this.element.getElementsByTagName('tbody')[0];
   
   var tr = document.createElement('tr');
@@ -13,7 +13,7 @@ JsUnitTest.Unit.Logger.prototype.start = function(testName) {
   //testname
   td = document.createElement('td');
   td.appendChild(document.createTextNode(testName));
-  tr.appendChild(td)
+  tr.appendChild(td);
   
   tr.appendChild(document.createElement('td'));//status
   tr.appendChild(document.createElement('td'));//message
@@ -29,13 +29,13 @@ JsUnitTest.Unit.Logger.prototype.setStatus = function(status) {
 };
   
 JsUnitTest.Unit.Logger.prototype.finish = function(status, summary) {
-  if (!this.element) return;
+  if (!this.element) {return;}
   this.setStatus(status);
   this.message(summary);
 };
   
 JsUnitTest.Unit.Logger.prototype.message = function(message) {
-  if (!this.element) return;
+  if (!this.element) {return;}
   var cell = this.getMessageCell();
   
   // cell.appendChild(document.createTextNode(this._toHTML(message)));
@@ -43,7 +43,7 @@ JsUnitTest.Unit.Logger.prototype.message = function(message) {
 };
   
 JsUnitTest.Unit.Logger.prototype.summary = function(summary) {
-  if (!this.element) return;
+  if (!this.element) {return;}
   var div = this.element.getElementsByTagName('div')[0];
   div.innerHTML = this._toHTML(summary);
 };

data/vendor/jsunittest/src/message_template.js

@@ -12,6 +12,6 @@ JsUnitTest.Unit.MessageTemplate.prototype.evaluate = function(params) {
     var part = this.parts[i];
     var result = (part == '?') ? JsUnitTest.inspect(params.shift()) : part.replace(/\\\?/, '?');
     results.push(result);
-  };
+  }
   return results.join('');
 };

data/vendor/jsunittest/src/prototype/event.js

@@ -10,9 +10,9 @@ JsUnitTest.Event.addEvent = function(element, type, handler) {
 		element.addEventListener(type, handler, false);
 	} else {
 		// assign each event handler a unique ID
-		if (!handler.$$guid) handler.$$guid = JsUnitTest.Event.addEvent.guid++;
+		if (!handler.$$guid) {handler.$$guid = JsUnitTest.Event.addEvent.guid++;}
 		// create a hash table of event types for the element
-		if (!element.events) element.events = {};
+		if (!element.events) {element.events = {};}
 		// create a hash table of event handlers for each element/event pair
 		var handlers = element.events[type];
 		if (!handlers) {

data/vendor/jsunittest/src/prototype/template.js

@@ -4,30 +4,31 @@ JsUnitTest.Template = function(template, pattern) {
 };
 
 JsUnitTest.Template.prototype.evaluate = function(object) {
-  if (typeof object.toTemplateReplacements == "function")
+  if (typeof object.toTemplateReplacements == "function") {
     object = object.toTemplateReplacements();
+  }
 
   return JsUnitTest.gsub(this.template, this.pattern, function(match) {
-    if (object == null) return '';
+    if (object == null) {return '';}
 
     var before = match[1] || '';
-    if (before == '\\') return match[2];
+    if (before == '\\') {return match[2];}
 
     var ctx = object, expr = match[3];
     var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
     match = pattern.exec(expr);
-    if (match == null) return before;
+    if (match == null) {return before;}
 
     while (match != null) {
       var comp = (match[1].indexOf('[]') === 0) ? match[2].gsub('\\\\]', ']') : match[1];
       ctx = ctx[comp];
-      if (null == ctx || '' == match[3]) break;
+      if (null == ctx || '' == match[3]) {break;}
       expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
       match = pattern.exec(expr);
     }
 
     return before + JsUnitTest.String.interpret(ctx);
   });
-}
+};
 
 JsUnitTest.Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;

data/vendor/jsunittest/src/runner.js

@@ -23,7 +23,7 @@ JsUnitTest.Unit.Runner.prototype.portNumber = function() {
   if (window.location.search.length > 0) {
     var matches = window.location.search.match(/\:(\d{3,5})\//);
     if (matches) {
-      return parseInt(matches[1]);
+      return parseInt(matches[1], 10);
     }
   }
   return null;
@@ -31,22 +31,23 @@ JsUnitTest.Unit.Runner.prototype.portNumber = function() {
 
 JsUnitTest.Unit.Runner.prototype.getTests = function(testcases) {
   var tests = [], options = this.options;
-  if (this.queryParams.tests) tests = this.queryParams.tests.split(',');
-  else if (options.tests) tests = options.tests;
-  else if (options.test) tests = [option.test];
+  if (this.queryParams.tests) {tests = this.queryParams.tests.split(',');}
+  else if (options.tests) {tests = options.tests;}
+  else if (options.test) {tests = [option.test];}
   else {
     for (testname in testcases) {
-      if (testname.match(/^test/)) tests.push(testname);
+      if (testname.match(/^test/)) {tests.push(testname);}
     }
   }
   var results = [];
   for (var i=0; i < tests.length; i++) {
     var test = tests[i];
-    if (testcases[test])
+    if (testcases[test]) {
       results.push(
         new JsUnitTest.Unit.Testcase(test, testcases[test], testcases.setup, testcases.teardown)
       );
-  };
+    }
+  }
   return results;
 };
 
@@ -65,7 +66,7 @@ JsUnitTest.Unit.Runner.prototype.getResult = function() {
     results.failures   += test.failures;
     results.errors     += test.errors;
     results.warnings   += test.warnings;
-  };
+  }
   return results;
 };
 
@@ -83,15 +84,15 @@ JsUnitTest.Unit.Runner.prototype.postResults = function() {
     JsUnitTest.ajax({
       url: url,
       type: 'GET'      
-    })
+    });
   }
 };
 
 JsUnitTest.Unit.Runner.prototype.runTests = function() {
   var test = this.tests[this.currentTest], actions;
   
-  if (!test) return this.finish();
-  if (!test.isWaiting) this.logger.start(test.name);
+  if (!test) {return this.finish();}
+  if (!test.isWaiting) {this.logger.start(test.name);}
   test.run();
   var self = this;
   if(test.isWaiting) {
@@ -104,7 +105,7 @@ JsUnitTest.Unit.Runner.prototype.runTests = function() {
   }
   
   this.logger.finish(test.status(), test.summary());
-  if (actions = test.actions) this.logger.appendActionButtons(actions);
+  if (actions = test.actions) {this.logger.appendActionButtons(actions);}
   this.currentTest++;
   // tail recursive, hopefully the browser will skip the stackframe
   this.runTests();

data/vendor/jsunittest/src/test_case.js

@@ -31,7 +31,7 @@ JsUnitTest.Unit.Testcase.prototype.wait = function(time, nextPart) {
 JsUnitTest.Unit.Testcase.prototype.run = function(rethrow) {
   try {
     try {
-      if (!this.isWaiting) this.setup();
+      if (!this.isWaiting) {this.setup();}
       this.isWaiting = false;
       this.test();
     } finally {
@@ -41,7 +41,7 @@ JsUnitTest.Unit.Testcase.prototype.run = function(rethrow) {
     }
   }
   catch(e) { 
-    if (rethrow) throw e;
+    if (rethrow) {throw e;}
     this.error(e, this); 
   }
 };
@@ -85,14 +85,19 @@ JsUnitTest.Unit.Testcase.prototype.info = function(message) {
 
 JsUnitTest.Unit.Testcase.prototype.error = function(error, test) {
   this.errors++;
-  this.actions['retry with throw'] = function() { test.run(true) };
+  this.actions['retry with throw'] = function() { test.run(true); };
   this.messages.push(error.name + ": "+ error.message + "(" + JsUnitTest.inspect(error) + ")");
+  if( typeof console != "undefined" && console.error) {
+   console.error("Test '" + test.name + "' died, exception and test follows");
+   console.error(error);
+   console.error(test.test.toString());
+  }
 };
 
 JsUnitTest.Unit.Testcase.prototype.status = function() {
-  if (this.failures > 0) return 'failed';
-  if (this.errors > 0) return 'error';
-  if (this.warnings > 0) return 'warning';
+  if (this.failures > 0) {return 'failed';}
+  if (this.errors > 0) {return 'error';}
+  if (this.warnings > 0) {return 'warning';}
   return 'passed';
 };
 

data/vendor/jsunittest/test/unit/assertions_test.html

@@ -82,6 +82,9 @@
       assertEqual("a", "a");
       assertEqual("a", "a", "test");
       
+      assertEqual("A\nnew line", "A\nnew line", "New lines");
+      assertEqual("A\x18special char", "A\x18special char", "Other special char");
+      
       assertNotEqual(0, 1);
       assertNotEqual("a","b");
       assertNotEqual({},{});
@@ -165,10 +168,15 @@
     testHasClass: function() { with(this) {
       // <div id="test_1" class="a bbbbbbbbbbbb cccccccccc dddd"> </div>
       assertHasClass('test_1', 'a');
-      // info(document.getElementById('test_1').className);
       assertHasClass(document.getElementById('test_1'), 'dddd');
     }},
     
+    testNotHasClass: function() { with(this) {
+      // <div id="test_1" class="a bbbbbbbbbbbb cccccccccc dddd"> </div>
+      assertNotHasClass('test_1', 'abc');
+      assertNotHasClass(document.getElementById('test_1'), 'ddd');
+    }},
+    
     testAssertVisible: function() { with(this) {
       assertVisible('testcss1');
       assertNotVisible('testcss1_span');

data/vendor/jsunittest/test/unit/common_test.html

@@ -51,11 +51,19 @@
       var expected = [ 'a', 1, 'b', 2, 'zzz', 1, 2, 3];
       var actual   = JsUnitTest.flattenArray(original);
       assertEnumEqual(expected, actual);
+    }},
+    testToHexString: function() { with(this) {
+      assertEqual('01', JsUnitTest.toHexString(1));
+      assertEqual('0f', JsUnitTest.toHexString(15));
+      assertEqual('f0', JsUnitTest.toHexString(240));
+      assertEqual('ff', JsUnitTest.toHexString(255));
     }}
 
     
+
+    
   }); 
 // ]]>
 </script>
 </body>
-</html>
+</html>

data/vendor/jsunittest/test/unit/logger_test.html

@@ -82,7 +82,7 @@
       logger.start("test 1");
       logger.summary("some summary");
       assertMatch(/some\ssummary/, testlog_test.innerHTML);
-    }},
+    }}
 
     
       
@@ -95,4 +95,4 @@
 // ]]>
 </script>
 </body>
-</html>
+</html>

data/vendor/jsunittest/test/unit/message_template_test.html

@@ -34,11 +34,11 @@
     testBuildMessage:  function() {
       this.assertEqual("'foo' 'bar'", this.buildMessage('', '? ?', 'foo', 'bar'))
       // this.assertEqual("<'foo'> 'bar'", this.buildMessage('', '<?> ?', 'foo', 'bar'))
-    },
+    }
 
     
   }); 
 // ]]>
 </script>
 </body>
-</html>
+</html>

data/vendor/jsunittest/test/unit/runner_test.html

@@ -67,11 +67,11 @@
       assertEqual(0, results.failures);
       assertEqual(0, results.warnings);
       assertEqual("2 tests, 2 assertions, 0 failures, 0 errors, 0 warnings", runner.summary());
-    }},
+    }}
 
     
   }); 
 // ]]>
 </script>
 </body>
-</html>
+</html>

data/vendor/jsunittest/test/unit/template_test.html

@@ -47,11 +47,11 @@
       var pattern = /(^|.|\r|\n)(#\((.*?)\))/;
       assertEqual('#{name}: Stephan', new JsUnitTest.Template('\\#{name}: #{name}').evaluate(subject));
       assertEqual('#(name): Stephan', new JsUnitTest.Template('\\#(name): #(name)', pattern).evaluate(subject));
-    }},
+    }}
     
       
   }); 
 // ]]>
 </script>
 </body>
-</html>
+</html>

data/vendor/jsunittest/test/unit/test_case_test.html

@@ -83,15 +83,36 @@
 
     // Error
     testError: function() { with(this) {
-      testcase.error({name: "name", message: "An Error"});
+      testcase.error({name: "name", message: "An Error"}, testcase);
       assertEqual(0, testcase.assertions, "Assertions");
       assertEqual(1, testcase.errors, "Errors");
-      assertEqual("name: An Error([object Object])", testcase.messages[0], 'Should be equal');
+      assertEqual("name: An Error(Object: { name: name, message: An Error })", testcase.messages[0], 'Should be equal');
       assertEqual('error', testcase.status(), 'Should be equal');
     }},
+    
+    testErrorOnFirebug : function() { with(this) {
+      var results = [];
+      var orig_console = window.console;
+      try {
+        // we need to delete the firebug console on Firefox
+        // but the delete statement fails on IE
+        delete window.console;
+      } catch(e) {};
+      window.console = {
+        error: function(s) {
+          results.push(s);
+        }
+      };
+      testcase.error({name: "name", message: "An Error"}, testcase);
+      var fn = function() {};
+      assertEqual("Test 'name' died, exception and test follows", results[0]);
+      assertEqual(fn.toString(), results[2]);
+      assertHashEqual({ message: 'An Error', name: 'name' }, results[1]);
+      window.console = orig_console;
+    }}
 
   }); 
 // ]]>
 </script>
 </body>
-</html>
+</html>

data/vendor/jsunittest/website/index.html

@@ -31,13 +31,13 @@
     <h1>JsUnitTest &#8211; JavaScript Unit Testing framework</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/drnicjavascript"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/drnicjavascript" class="numbers">0.7.2</a>
+      <a href="http://rubyforge.org/projects/drnicjavascript" class="numbers">0.7.3</a>
     </div>
     <h2>What</h2>
 <p>This JavaScript project provides a one-file JavaScript test suite.</p>
 <p>This is based off unittest.js from <a href="http://prototypejs.org">prototypejs</a>, except this library has no dependency on prototype.js so there is no chance your code-under-test can conflict with prototype.js or that you might accidently use a prototype.js helper for a library that will be deployed independently off prototypejs.</p>
 <p>There is also a TextMate bundle with snippets for creating the runner and assertions.</p>
-<p><a href="tmbundle/JavaScript Unit Testing.tmbundle.tar.gz"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a> &#8211; click to download. More information below.</p>
+<p><a class="image" href="tmbundle/JavaScript Unit Testing.tmbundle.tar.gz"><img src="images/logo_bundle.png" alt="Logo Bundle" border=0></a> &#8211; click to download. More information below.</p>
 <h2>Downloading</h2>
 <p>Get the latest here: <a href="dist/jsunittest.js">jsunittest.js</a></p>
 <p>Alternately, download the source for the project via the large version number box to the top-right.</p>
@@ -83,7 +83,7 @@ example_test.html<br />
 <h2>Contact</h2>
 <p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a> via the <a href="http://groups.google.com/group/drnic-javascript-projects">forum</a></p>
     <p class="coda">
-      <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 23rd February 2009<br>
+      <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 20th March 2009<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/vendor/jsunittest/website/index.txt

@@ -8,7 +8,7 @@ This is based off unittest.js from "prototypejs":http://prototypejs.org, except
 
 There is also a TextMate bundle with snippets for creating the runner and assertions.
 
-<a href="tmbundle/JavaScript Unit Testing.tmbundle.tar.gz"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a> - click to download. More information below.
+<a class="image" href="tmbundle/JavaScript Unit Testing.tmbundle.tar.gz"><img src="images/logo_bundle.png" alt="Logo Bundle" border=0></a> - click to download. More information below.
 
 h2. Downloading
 

data/vendor/jsunittest/website/stylesheets/screen.css

@@ -28,6 +28,9 @@ a {
   font-weight: normal;
   text-decoration: underline;
 }
+a.image {
+	background: none;
+}
 blockquote {
   font-size: 90%;
   font-style: italic;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newjs
 version: !ruby/object:Gem::Version 
-  version: 1.7.2
+  version: 1.7.4
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 00:00:00 +10:00
+date: 2009-07-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.5.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.1
     version: 
 description: |-
   The +newjs+ command creates a new JavaScript project/application
@@ -40,19 +40,13 @@ email:
 executables: 
 - newjs
 - newjs_iphone
+- newjs_screwunit
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.rdoc
 - newjs_generators/install_website/templates/website/index.txt
-- vendor/jshoulda/History.txt
-- vendor/jshoulda/License.txt
-- vendor/jsunittest/History.txt
-- vendor/jsunittest/License.txt
-- vendor/jsunittest/README.txt
-- vendor/jsunittest/website/index.txt
 - website/index.txt
 files: 
 - History.txt
@@ -94,14 +88,23 @@ files:
 - 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/unittest.css
+- app_generators/newjs_screwunit/USAGE
+- app_generators/newjs_screwunit/newjs_screwunit_generator.rb
+- app_generators/newjs_screwunit/templates/Rakefile.erb
 - bin/newjs
 - bin/newjs_iphone
+- bin/newjs_screwunit
 - config/website.yml
 - config/website.yml.sample
 - features/development.feature
 - features/imported_files_for_generators.feature
-- features/steps/common.rb
-- features/steps/env.rb
+- features/newjs_screwunit.feature
+- features/step_definitions/cli_steps.rb
+- features/step_definitions/common_steps.rb
+- features/step_definitions/file_comparison_steps.rb
+- features/support/common.rb
+- features/support/env.rb
+- features/support/matchers.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
@@ -182,6 +185,7 @@ files:
 - test/test_install_website_generator.rb
 - test/test_newjs_generator.rb
 - test/test_newjs_iphone_generator.rb
+- test/test_newjs_screwunit_generator.rb
 - test/test_page_generator.rb
 - test/test_plain_theme_generator.rb
 - test/test_rack_javascript_test.rb
@@ -263,6 +267,7 @@ files:
 - vendor/jsunittest/config/deploy.rb
 - vendor/jsunittest/config/website.yml.sample
 - vendor/jsunittest/dist/jsunittest-0.7.2.js
+- vendor/jsunittest/dist/jsunittest-0.7.3.js
 - vendor/jsunittest/dist/jsunittest.js
 - vendor/jsunittest/dist/unittest.css
 - vendor/jsunittest/lib/jstest.rb
@@ -347,7 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: newjs
-rubygems_version: 1.3.2
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: The +newjs+ command creates a new JavaScript project/application with a default directory structure and configuration at the path you specify.
@@ -358,6 +363,7 @@ test_files:
 - test/test_install_website_generator.rb
 - test/test_newjs_generator.rb
 - test/test_newjs_iphone_generator.rb
+- test/test_newjs_screwunit_generator.rb
 - test/test_page_generator.rb
 - test/test_plain_theme_generator.rb
 - test/test_rack_javascript_test.rb