evergreen 0.4.0 → 0.4.1

data/README.rdoc

@@ -2,13 +2,19 @@
 
 "Because green is the new Blue(Ridge)"
 
-Evergreen is a tool to run javascript unit tests for client side JavaScript. It combines a server which allows you to serve up and run your specs in a browser, as well as a runner which uses Capybara and any of its drivers to run your specs. Evergreen uses the Jasmine unit testing framework for JavaScript.
+Evergreen is a tool to run javascript unit tests for client side JavaScript. It
+combines a server which allows you to serve up and run your specs in a browser,
+as well as a runner which uses Capybara and any of its drivers to run your
+specs. Evergreen uses the Jasmine unit testing framework for JavaScript.
 
 http://github.com/jnicklas/evergreen
 
 == Philosophy
 
-Evergreen is a unit testing tool. Its purpose is to test JavaScript in isolation from your application. If you need a tool that tests how your JavaScript integrates with your application you should use an integration testing framework, such as {Capybara}[http://github.com/jnicklas/capybara].
+Evergreen is a unit testing tool. Its purpose is to test JavaScript in
+isolation from your application. If you need a tool that tests how your
+JavaScript integrates with your application you should use an integration
+testing framework, such as {Capybara}[http://github.com/jnicklas/capybara].
 
 == Installation
 
@@ -18,7 +24,9 @@ Install as a Ruby gem:
 
 == Usage
 
-Evergreen assumes a file and directory structure, place all your javascript code inside ./public and all spec files inside ./spec/javascripts. All spec files should end in _spec.js. For example:
+Evergreen assumes a file and directory structure, place all your javascript
+code inside ./public and all spec files inside ./spec/javascripts. All spec
+files should end in _spec.js. For example:
 
     public/widget.js
     spec/javascripts/widget_spec.js
@@ -31,7 +39,8 @@ You can require files from the public directory inside your spec file:
       ...
     });
 
-You can now look at your spec files inside a browser by starting up the Evergreen server:
+You can now look at your spec files inside a browser by starting up the
+Evergreen server:
 
     evergreen serve
 
@@ -45,7 +54,8 @@ Add Evergreen to your Gemfile:
 
     gem 'evergreen', :require => 'evergreen/rails'
 
-Start your rails application and navigate to /evergreen. You should now see a list of all spec files, click on one to run it.
+Start your rails application and navigate to /evergreen. You should now see a
+list of all spec files, click on one to run it.
 
 There's a rake task provided for you that you can use to run your specs:
 
@@ -57,11 +67,15 @@ Add the following line to your Rakefile:
 
     require 'evergreen/tasks'
 
-This will give you the `spec:javascripts` rake task. Note that mounting is not possible under Rails 2 and that `require 'evergreen/rails'` will fail.
+This will give you the `spec:javascripts` rake task. Note that mounting is not
+possible under Rails 2 and that `require 'evergreen/rails'` will fail.
 
 == Configuration
 
-By default, Evergreen uses Selenium to run your specs and assumes a certain directory structure. If this standard is fine for you, then you don't need to do anything else. If you need to configure Evergreen to suit your needs, Evergreen will automatically look for and load the following files:
+By default, Evergreen uses Selenium to run your specs and assumes a certain
+directory structure. If this standard is fine for you, then you don't need to
+do anything else. If you need to configure Evergreen to suit your needs,
+Evergreen will automatically look for and load the following files:
 
     config/evergreen.rb
     .evergreen
@@ -80,7 +94,12 @@ The content of these files could look like this:
 
 == Transactions
 
-One problem often faced when writing unit tests for client side code is that changes to the page are not reverted for the next example, so that successive examples become dependent on each other. Evergreen adds a special div to your page with an id of test. This div is automatically emptied before each example. You should avoid appending markup to the page body and instead append it to this test div:
+One problem often faced when writing unit tests for client side code is that
+changes to the page are not reverted for the next example, so that successive
+examples become dependent on each other. Evergreen adds a special div to your
+page with an id of test. This div is automatically emptied before each example.
+You should avoid appending markup to the page body and instead append it to
+this test div:
 
     describe('transactions', function() {
       it("should add stuff in one test...", function() {
@@ -95,12 +114,14 @@ One problem often faced when writing unit tests for client side code is that cha
 
 == Templates
 
-Even more powerful than that, Evergreen allows you to create HTML templates to go along with your specs. Put the templates in their own folder like this:
+Even more powerful than that, Evergreen allows you to create HTML templates to
+go along with your specs. Put the templates in their own folder like this:
 
     spec/javascripts/templates/one_template.html
     spec/javascripts/templates/another_template.html
 
-You can then load the template into the test div, by calling the template function in your specs:
+You can then load the template into the test div, by calling the template
+function in your specs:
 
     describe('transactions', function() {
       template('one_template.html')
@@ -116,19 +137,36 @@ If you add a spec_helper file like so:
 
     spec/javascripts/spec_helper.js
 
-It will automatically be loaded. This is a great place for adding custom matchers and the like.
+It will automatically be loaded. This is a great place for adding custom
+matchers and the like.
 
 == CoffeeScript
 
-Evergreen supports specs written in {CoffeeScript}[http://github.com/jashkenas/coffee-script]. Just name your spec file _spec.coffee and it will automatically be translated for you.
+Evergreen supports specs written in
+{CoffeeScript}[http://github.com/jashkenas/coffee-script]. Just name your spec
+file _spec.coffee and it will automatically be translated for you.
 
-You can also add a CoffeeScript spec helper, but remember that CoffeeScript encloses individual files in a closure, if you need something you define in the spec helper to be available in your spec files, attach it to the window object:
+You can also add a CoffeeScript spec helper, but remember that CoffeeScript
+encloses individual files in a closure, if you need something you define in the
+spec helper to be available in your spec files, attach it to the window object:
 
     # spec/javascripts/spec_helper.coffee
 
     MyThing: "foo"          # local to spec helper
     window.MyThing: "foo"   # global
 
+== Development
+
+If you plan to work on Evergreen, you need to checkout the Jasmine gem, which
+is added as a git submodule. Run the following command:
+
+    git submodule update --init
+
+If you're using a version of Evergreen from git with bundler, you need to tell
+bundler to use submodules, this can be achieved with the following command:
+
+    gem 'evergreen', :submodules => true, :git => 'git://github.com/jnicklas/evergreen.git'
+
 == License:
 
 (The MIT License)

data/lib/evergreen.rb

@@ -21,6 +21,11 @@ module Evergreen
       yield self
     end
 
+    def extensions(&block)
+      @extensions = block if block
+      @extensions
+    end
+
     def use_defaults!
       configure do |config|
         config.driver = :selenium

data/lib/evergreen/application.rb

@@ -1,6 +1,8 @@
 module Evergreen
   def self.application(suite)
     Rack::Builder.new do
+      instance_eval(&Evergreen.extensions) if Evergreen.extensions
+
       map "/jasmine" do
         use Rack::Static, :urls => ["/"], :root => File.expand_path('../jasmine/lib', File.dirname(__FILE__))
         run lambda { |env| [404, {}, "No such file"]}

data/lib/evergreen/spec.rb

@@ -2,8 +2,6 @@ require 'open3'
 
 module Evergreen
   class Spec
-    class CoffeeScriptError < StandardError; end
-
     attr_reader :name, :suite
 
     def initialize(suite, name)
@@ -21,9 +19,8 @@ module Evergreen
 
     def read
       if full_path =~ /\.coffee$/
-        stdout, stderr = Open3.popen3("coffee -p #{full_path}")[1,2].map { |b| b.read }
-        raise CoffeeScriptError, stderr unless stderr.empty?
-        stdout
+        require 'coffee-script'
+        CoffeeScript.compile(File.read(full_path))
       else
         File.read(full_path)
       end

data/lib/evergreen/suite.rb

@@ -30,8 +30,8 @@ module Evergreen
     end
 
     def specs
-      Dir.glob(File.join(root, Evergreen.spec_dir, '*_spec.{js,coffee}')).map do |path|
-        Spec.new(self, File.basename(path))
+      Dir.glob(File.join(root, Evergreen.spec_dir, '**/*_spec.{js,coffee}')).map do |path|
+        Spec.new(self, path.gsub(File.join(root, Evergreen.spec_dir, ''), ''))
       end
     end
 

data/lib/evergreen/template.rb

@@ -20,6 +20,10 @@ module Evergreen
     end
     alias_method :contents, :read
 
+    def escaped_contents
+      contents.to_json.gsub("<script>", %{<scr" + "ipt>}).gsub("</script>", %{</scr" + "ipt>})
+    end
+
     def exist?
       File.exist?(full_path)
     end

data/lib/evergreen/version.rb

@@ -1,3 +1,3 @@
 module Evergreen
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/evergreen/views/spec.erb

@@ -25,14 +25,16 @@
 <div id="test"></div>
 
 <script type="text/javascript">
-  (function() {
-    Evergreen.driver = <%= Evergreen.driver.to_json %>;
-    <% @suite.templates.each do |template| %>
-      Evergreen.templates[<%= template.name.to_json %>] = <%= template.read.to_json %>;
-    <% end %>
-    var jasmineEnv = jasmine.getEnv();
-    jasmineEnv.addReporter(new jasmine.TrivialReporter());
-    jasmineEnv.addReporter(new Evergreen.ReflectiveReporter());
-    jasmineEnv.execute();
-  })();
+  // <![CDATA[
+    (function() {
+      Evergreen.driver = <%= Evergreen.driver.to_json %>;
+      <% @suite.templates.each do |template| %>
+        Evergreen.templates[<%= template.name.to_json %>] = <%= template.escaped_contents %>;
+      <% end %>
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.addReporter(new jasmine.TrivialReporter());
+      jasmineEnv.addReporter(new Evergreen.ReflectiveReporter());
+      jasmineEnv.execute();
+    })();
+  // ]]>
 </script>

data/spec/evergreen_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Evergreen, ".application" do
-  include Capybara
+  include Capybara::DSL
 
   it "should show a successful test run" do
     visit("/")
@@ -21,4 +21,9 @@ describe Evergreen, ".application" do
     page.should have_content("2 specs, 1 failure")
     page.should have_content("Expected 'bar' to equal 'noooooo'.")
   end
+
+  it "should add extensions to Evergreen" do
+    visit('/awesome')
+    page.should have_content('Totally awesome')
+  end
 end

data/spec/runner_spec.rb

@@ -14,7 +14,7 @@ describe Evergreen::Runner do
 
       it { should include('.F..') }
       it { should include("Expected 'bar' to equal 'noooooo'") }
-      it { should include("17 examples, 3 failures") }
+      it { should include("18 examples, 3 failures") }
     end
   end
 

data/spec/spec_helper.rb

@@ -5,9 +5,15 @@ require 'evergreen'
 require 'rspec'
 
 require 'capybara/dsl'
-require 'capybara/envjs'
+require 'capybara-webkit'
 
-TEST_DRIVER = :envjs
+TEST_DRIVER = :webkit
+
+Evergreen.extensions do
+  map "/awesome" do
+    run lambda { |env| [200, {'Content-Type' => 'text/html'}, "<html><body>Totally awesome</body></html>"]}
+  end
+end
 
 Capybara.app = Evergreen::Suite.new(File.expand_path('suite1', File.dirname(__FILE__))).application
 Capybara.default_driver = TEST_DRIVER

data/spec/suite1/spec/javascripts/templates/escape.html

@@ -0,0 +1 @@
+<script>var foo = 0;</script>

data/spec/suite1/spec/javascripts/templates/script_tags.html

@@ -0,0 +1,3 @@
+<h1 id="script-tags"></h1>
+
+<script></script>

data/spec/suite1/spec/javascripts/templates_spec.js

@@ -33,6 +33,14 @@ describe('templates', function() {
     });
   });
 
+  describe('with template with script tags', function() {
+    template('script_tags.html')
+
+    it("should append the template to the test div", function() {
+      expect($('#test h1#script-tags').length).toEqual(1);
+    });
+  });
+
 });
 
 describe('stylesheet', function() {

data/spec/suite_spec.rb

@@ -13,8 +13,8 @@ describe Evergreen::Suite do
   end
 
   describe '#specs' do
-    it "should find all specs in the given root directory" do
-      subject.specs.map(&:name).should include('testing_spec.js', 'foo_spec.js', 'bar_spec.js', 'coffeescript_spec.coffee')
+    it "should find all specs recursively in the given root directory" do
+      subject.specs.map(&:name).should include('testing_spec.js', 'foo_spec.js', 'bar_spec.js', 'libs/lucid_spec.js', 'models/game_spec.js')
     end
   end
 

data/spec/template_spec.rb

@@ -20,3 +20,13 @@ describe Evergreen::Template do
   end
 
 end
+
+describe Evergreen::Template, "escaping" do
+  let(:root) { File.expand_path('suite1', File.dirname(__FILE__)) }
+  let(:suite) { Evergreen::Suite.new(root) }
+  subject { Evergreen::Template.new(suite, 'escape.html') }
+
+  it "escapes contents" do
+    subject.escaped_contents.strip.should == %{"<scr" + "ipt>var foo = 0;</scr" + "ipt>\\n"}
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: evergreen
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 +01:00
+date: 2011-06-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
+        - 1
         - 0
-        - 4
-        - 0
-        version: 0.4.0
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +41,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 5
-        version: 0.3.5
+        version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,7 +53,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 13
         segments: 
@@ -73,18 +70,30 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: coffee-script
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,23 +104,39 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: capybara-envjs
+  name: capybara-webkit
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: -1848230056
         segments: 
+        - 1
         - 0
-        - 4
         - 0
-        version: 0.4.0
+        - beta4
+        version: 1.0.0.beta4
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: therubyracer
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :development
+  version_requirements: *id008
 description: Run Jasmine JavaScript unit tests, integrate them into Ruby applications.
 email: 
 - jonas.nicklas@gmail.com
@@ -225,11 +250,15 @@ files:
 - spec/suite1/spec/javascripts/failing_spec.js
 - spec/suite1/spec/javascripts/foo_spec.js
 - spec/suite1/spec/javascripts/invalid_coffee_spec.coffee
+- spec/suite1/spec/javascripts/libs/lucid_spec.js
+- spec/suite1/spec/javascripts/models/game_spec.js
 - spec/suite1/spec/javascripts/slow_spec.coffee
 - spec/suite1/spec/javascripts/spec_helper.coffee
 - spec/suite1/spec/javascripts/spec_helper.js
 - spec/suite1/spec/javascripts/templates/another_template.html
+- spec/suite1/spec/javascripts/templates/escape.html
 - spec/suite1/spec/javascripts/templates/one_template.html
+- spec/suite1/spec/javascripts/templates/script_tags.html
 - spec/suite1/spec/javascripts/templates_spec.js
 - spec/suite1/spec/javascripts/testing_spec.js
 - spec/suite1/spec/javascripts/transactions_spec.js