@@ -1,3 +1,7 @@
+== 1.7.2 2009-04-18
+
+* newjs command: oops, jquery/prototype installed into src/ext instead of lib/ext
+
== 1.7.1 2009-04-18
* newjs command: -j/--jshoulda flag to use jshoulda instead of vanilla jsunittest
History.txt
@@ -45,7 +45,7 @@ class NewjsGenerator < RubiGen::Base
m.file "test/assets/jsunittest.js", "test/assets/jsunittest.js"
m.file "test/assets/jshoulda.js", "test/assets/jshoulda.js" if test_framework
m.file "test/assets/unittest.css", "test/assets/unittest.css"
- m.file "ext/#{framework}.js", "lib/ext/#{framework}.js" if framework
+ m.file "ext/#{framework}.js", "src/ext/#{framework}.js" if framework
%w[rstakeout js_autotest].each do |file|
m.template "script/#{file}", "script/#{file}", script_options
@@ -119,8 +119,8 @@ EOS
# created so don't sweat their absence here.
BASEDIRS = %w(
config
- lib/ext
- src
+ lib
+ src/ext
script
tasks
test/assets
app_generators/newjs/newjs_generator.rb
@@ -5,7 +5,7 @@
<title>JavaScript unit test file</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<script src="../assets/jsunittest.js" type="text/javascript"></script>
- <% if testing_lib == 'jshoulda' %>
+ <% if test_framework == 'jshoulda' %>
<script src="../assets/jshoulda.js" type="text/javascript"></script>
<% end %>
@@ -33,7 +33,7 @@
<script type="text/javascript">
// <![CDATA[
-<% if testing_lib.nil? %>
+<% if test_framework.nil? %>
new Test.Unit.Runner({
// replace this with your real tests
setup: function() {
@@ -54,7 +54,7 @@
// That is, you can have multiple "new Test.Unit.Runner() { ... }" on this page, just
// create more <div id="testlog2"></div> etc, and pass the element id to the hash above:
// e.g. {testLog: "testlog2"}
-<% elsif testing_lib == 'jshoulda' %>
+<% elsif test_framework == 'jshoulda' %>
context("A context", {
setup: function() {
javascript_test_generators/functional_test/templates/test/test.html.erb
@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
module Newjs
- VERSION = '1.7.1'
+ VERSION = '1.7.2'
end
require 'newjs/jstest'
\ No newline at end of file
lib/newjs.rb
@@ -62,7 +62,6 @@ class TestNewjsGenerator < Test::Unit::TestCase
assert_generated_file "test/assets/unittest.css"
assert_generated_file "test/assets/jsunittest.js"
assert_generated_file "test/assets/jshoulda.js"
- assert_generated_file "lib/ext/jquery.js"
assert_generated_file "Rakefile"
assert_generated_file "README.txt"
assert_generated_file "License.txt"
@@ -75,6 +74,7 @@ class TestNewjsGenerator < Test::Unit::TestCase
assert_generated_file "config/javascript_test_autotest.yml.sample"
assert_generated_file "src/myproject.js.erb"
assert_generated_file "src/HEADER"
+ assert_generated_file "src/ext/jquery.js"
assert_generated_file "lib/protodoc.rb"
assert_generated_file "lib/jstest.rb"
end
test/test_newjs_generator.rb
@@ -31,7 +31,7 @@
<h1>JavaScript Project Generator</h1>
<div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/newjs"; return false'>
<p>Get Version</p>
- <a href="http://rubyforge.org/projects/newjs" class="numbers">1.7.0</a>
+ <a href="http://rubyforge.org/projects/newjs" class="numbers">1.7.2</a>
</div>
<h1>&#x2192; ‘newjs’</h1>
<h2>What</h2>
website/index.html
34ad76b92469c75d31579642b11e6395835ac5fb
Dr Nic Williams
drnicwilliams@gmail.com
http://github.com/drnic/newjs/commit/4cfe7166a4be2df1dfedf5d892f4055f0c58ff8a
4cfe7166a4be2df1dfedf5d892f4055f0c58ff8a
2009-04-18T20:55:40-07:00
2009-04-18T20:55:02-07:00
newjs command: oops, jquery/prototype installed into src/ext instead of lib/ext
4f858c6981bf8451024adc7b8a1e985c1c96c7ef
Dr Nic Williams
drnicwilliams@gmail.com