evergreen 0.2.2 → 0.3.0

data/README.rdoc

@@ -33,7 +33,7 @@ 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:
 
-    evergreen server
+    evergreen serve
 
 Alternatively you can run the specs headlessly by running:
 
@@ -69,12 +69,20 @@ 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. Simply name the template the same as the spec, only with an html extension. For example:
+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/widget_spec.js
-    spec/javascripts/widget_spec.html
+    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:
+
+    describe('transactions', function() {
+      template('one_template.html')
 
-The template will be placed inside the test div, so that means it should not include html, head, body or similar tags. The template will be restored for each example, so that at the start of each example, the markup inside the test div is identical.
+      it("should load the template in this test", function() {
+        ...
+      });
+    });
 
 == Spec Helper
 

data/lib/evergreen.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'sinatra/base'
 require 'capybara'
-require 'capybara/envjs'
 require 'capybara/wait_until'
 require 'launchy'
 require 'evergreen/version'
@@ -12,45 +11,59 @@ module Evergreen
   autoload :Server, 'evergreen/server'
   autoload :Runner, 'evergreen/runner'
   autoload :Spec, 'evergreen/spec'
+  autoload :Template, 'evergreen/template'
 
   class << self
-    def application(root)
-      Class.new(Sinatra::Base).tap do |app|
-        app.reset! 
-        app.class_eval do
-          set :static, true
-          set :root, File.expand_path('evergreen', File.dirname(__FILE__))
-          set :public, File.expand_path(File.join(root, 'public'), File.dirname(__FILE__))
-
-          use Rack::Static, :urls => ["/lib"], :root => File.expand_path('jasmine', File.dirname(__FILE__))
-          use Rack::Static, :urls => ["/evergreen"], :root => File.dirname(__FILE__)
-
-          helpers do
-            def url(path)
-              request.env['SCRIPT_NAME'].to_s + path.to_s
-            end
-          end
+    def application(root, driver=:serve)
+      Rack::Builder.new do
+        map "/jasmine" do
+          use Rack::Static, :urls => ["/"], :root => File.expand_path('jasmine/lib', File.dirname(__FILE__))
+          run lambda { |env| [404, {}, "No such file"]}
+        end
 
-          get '/' do
-            @specs = Spec.all(root)
-            erb :list
-          end
+        map "/resources" do
+          use Rack::Static, :urls => ["/"], :root => File.expand_path('evergreen/resources', File.dirname(__FILE__))
+          run lambda { |env| [404, {}, "No such file"]}
+        end
 
-          get '/list' do
-            @specs = Spec.all(root)
-            erb :list
-          end
+        map "/" do
+          app = Class.new(Sinatra::Base).tap do |app|
+            app.reset!
+            app.class_eval do
+              set :static, true
+              set :root, File.expand_path('evergreen', File.dirname(__FILE__))
+              set :public, File.expand_path(File.join(root, 'public'), File.dirname(__FILE__))
 
-          get '/run/*' do |name|
-            @spec = Spec.new(root, name)
-            @js_spec_helper = Spec.new(root, 'spec_helper.js')
-            @coffee_spec_helper = Spec.new(root, 'spec_helper.coffee')
-            erb :spec
-          end
+              helpers do
+                def url(path)
+                  request.env['SCRIPT_NAME'].to_s + path.to_s
+                end
+              end
+
+              get '/' do
+                @specs = Spec.all(root)
+                erb :list
+              end
+
+              get '/list' do
+                @specs = Spec.all(root)
+                erb :list
+              end
 
-          get '/spec/*' do |name|
-            Spec.new(root, name).read
+              get '/run/*' do |name|
+                @spec = Spec.new(root, name)
+                @js_spec_helper = Spec.new(root, 'spec_helper.js')
+                @coffee_spec_helper = Spec.new(root, 'spec_helper.coffee')
+                @driver = driver
+                erb :spec
+              end
+
+              get '/spec/*' do |name|
+                Spec.new(root, name).read
+              end
+            end
           end
+          run app
         end
       end
     end

data/lib/evergreen/resources/evergreen.css

@@ -0,0 +1,62 @@
+body {
+  font-family: 'Lucida grande', 'sans-serif';
+  background: #f0f0f0;
+}
+
+a {
+  color: #00A500;
+}
+
+#page, #test, .jasmine_reporter {
+  width: 800px;
+  background: white;
+  -moz-border-radius: 3px;
+  padding: 20px;
+  margin: 50px auto 30px;
+  border: 1px solid #ddd
+}
+
+#test {
+  min-height: 50px;
+  margin: 30px auto 30px;
+}
+
+.jasmine_reporter {
+  margin: 30px auto 30px;
+}
+
+#page h1 {
+  font-size: 24px;
+  margin: 0 0 15px;
+}
+
+#page a.back {
+  font-size: 12px;
+}
+
+#page ul {
+  margin: 0;
+  padding: 0;
+}
+
+#page ul li {
+  list-style: none;
+  border: 1px solid #ddd;
+  -moz-border-radius: 3px;
+  margin: 10px 0;
+  background: #f5f5f5;
+}
+
+#page ul li a {
+  padding: 7px 10px;
+  display: block;
+  text-decoration: none;
+}
+
+#footer {
+  margin: 0 auto 30px;
+  width: 600px;
+  text-align: center;
+  font-size: 13px;
+  color: #aaa;
+}

data/lib/evergreen/{evergreen.js → resources/evergreen.js}

@@ -16,20 +16,35 @@ Evergreen.ReflectiveReporter = function() {
       trace: item.trace
     });
   };
+  this.reportRunnerResults = function(runner) {
+    Evergreen.done = true;
+  };
 };
+
+Evergreen.templates = {};
+
 Evergreen.getResults = function() {
   return JSON.stringify(Evergreen.results);
 };
 
 beforeEach(function() {
-  var test = document.getElementById('test');
-  test.innerHTML = Evergreen.template;
+  document.getElementById('test').innerHTML = "";
 });
 
+var template = function(name) {
+  beforeEach(function() {
+    document.getElementById('test').innerHTML = Evergreen.templates[name]
+  });
+};
+
 var require = function(file) {
   document.write('<script type="text/javascript" src="' + file + '"></script>');
 };
 
+var stylesheet = function(file) {
+  document.write('<link rel="stylesheet" type="text/css" href="' + file + '"/>');
+};
+
 // === JSON ===
 
 (function(){function f(n){return n<10?'0'+n:n;}

data/lib/evergreen/runner.rb

@@ -49,15 +49,12 @@ module Evergreen
 
     def results
       @results ||= begin
-        session = Capybara::Session.new(:envjs, Evergreen.application(spec.root))
+        session = Capybara::Session.new(:selenium, Evergreen.application(spec.root, :selenium))
         session.visit(spec.url)
+        session.wait_until(180) { session.evaluate_script('Evergreen.done') }
         JSON.parse(session.evaluate_script('Evergreen.getResults()'))
       end
     end
 
   end
 end
-
-
-
-

data/lib/evergreen/spec.rb

@@ -18,14 +18,6 @@ module Evergreen
       File.join(root, 'spec/javascripts', name)
     end
 
-    def template_path
-      full_path.sub(/\..+$/, '.html')
-    end
-
-    def template
-      if File.exist?(template_path) then File.read(template_path) else "" end
-    end
-
     def read
       if full_path =~ /\.coffee$/
         %x(coffee -p #{full_path})
@@ -43,5 +35,9 @@ module Evergreen
       File.exist?(full_path)
     end
 
+    def templates
+      Evergreen::Template.all(root)
+    end
+
   end
 end

data/lib/evergreen/template.rb

@@ -0,0 +1,31 @@
+module Evergreen
+  class Template
+
+    def self.all(root)
+      Dir.glob(File.join(root, 'spec/javascripts/templates', '*')).map do |path|
+        new(root, File.basename(path))
+      end
+    end
+
+    attr_reader :name, :root
+
+    def initialize(root, name)
+      @root = root
+      @name = name
+    end
+
+    def full_path
+      File.join(root, 'spec/javascripts/templates', name)
+    end
+
+    def read
+      File.read(full_path)
+    end
+    alias_method :contents, :read
+
+    def exist?
+      File.exist?(full_path)
+    end
+
+  end
+end

data/lib/evergreen/version.rb

@@ -1,3 +1,3 @@
 module Evergreen
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/lib/evergreen/views/layout.erb

@@ -0,0 +1,18 @@
+<!doctype html>
+
+<html>
+  <head>
+    <title>Evergreen</title>
+    <link rel="stylesheet" type="text/css" href="<%= url('/jasmine/jasmine.css') %>"/>
+    <link rel="stylesheet" type="text/css" href="<%= url('/resources/evergreen.css') %>"/>
+  </head>
+  <body>
+    <%= yield %>
+
+    <div id="footer">
+      Powered by <a href="http://github.com/jnicklas/evergreen">Evergreen</a>.
+      Evergreen is sponsored by <a href="http://elabs.se">Elabs</a>.
+    </div>
+  </body>
+</html>
+  

data/lib/evergreen/views/list.erb

@@ -1,67 +1,9 @@
-<!doctype html>
-
-<html>
-  <head>
-    <title>Evergreen</title>
-    <style type="text/css">
-      * { margin: 0; padding: 0; }
-      body {
-        font-family: 'Lucida grande', 'sans-serif';
-        background: #f0f0f0;
-      }
-      a {
-        color: #00A500;
-      }
-
-      #page {
-        width: 800px;
-        background: white;
-        -moz-border-radius: 3px;
-        padding: 20px;
-        margin: 50px auto 30px;
-        border: 1px solid #ddd
-      }
-
-      #page h1 {
-        margin: 0 0 30px;
-      }
-
-      #page ul li {
-        list-style: none;
-        border: 1px solid #ddd;
-        -moz-border-radius: 3px;
-        margin: 10px 0;
-        background: #f5f5f5;
-      }
-
-      #page ul li a {
-        padding: 7px 10px;
-        display: block;
-        text-decoration: none;
-      }
-
-      #footer {
-        margin: 0 auto 30px;
-        width: 600px;
-        text-align: center;
-        font-size: 13px;
-        color: #aaa;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="page">
-      <h1>Evergreen</h1>
-
-      <ul id="specs">
-        <% @specs.each do |spec| %>
-          <li><a href="<%= url(spec.url) %>"><%= spec.name %></a></li>
-        <% end %>
-      </ul>
-    </div>
-    <div id="footer">
-      Powered by <a href="http://github.com/jnicklas/evergreen">Evergreen</a>.
-      Evergreen is sponsored by <a href="http://elabs.se">Elabs</a>.
-    </div>
-  </body>
-</html>
+<div id="page">
+  <h1>Evergreen</h1>
+
+  <ul id="specs">
+    <% @specs.each do |spec| %>
+      <li><a href="<%= url(spec.url) %>"><%= spec.name %></a></li>
+    <% end %>
+  </ul>
+</div>

data/lib/evergreen/views/spec.erb

@@ -1,72 +1,30 @@
-<!doctype html>
+<script type="text/javascript" src="<%= url("/jasmine/jasmine.js") %>"></script>
+<script type="text/javascript" src="<%= url("/jasmine/jasmine-html.js") %>"></script>
+<script type="text/javascript" src="<%= url("/resources/evergreen.js") %>"></script>
+<% if @js_spec_helper.exist? %>
+  <script type="text/javascript" src="<%= url("/spec/#{@js_spec_helper.name}") %>"></script>
+<% end %>
+<% if @coffee_spec_helper.exist? %>
+  <script type="text/javascript" src="<%= url("/spec/#{@coffee_spec_helper.name}") %>"></script>
+<% end %>
+<script type="text/javascript" src="<%= url("/spec/#{@spec.name}") %>"></script>
 
-<html>
-  <head>
-    <link rel="stylesheet" type="text/css" href="<%= url('/lib/jasmine.css') %>">
-    <script type="text/javascript" src="<%= url("/lib/jasmine.js") %>"></script>
-    <script type="text/javascript" src="<%= url("/lib/jasmine-html.js") %>"></script>
-    <script type="text/javascript" src="<%= url("/evergreen/evergreen.js") %>"></script>
-    <script type="text/javascript" src="<%= url("/spec/#{@spec.name}") %>"></script>
-    <% if @js_spec_helper.exist? %>
-      <script type="text/javascript" src="<%= url("/spec/#{@js_spec_helper.name}") %>"></script>
-    <% end %>
-    <% if @coffee_spec_helper.exist? %>
-      <script type="text/javascript" src="<%= url("/spec/#{@coffee_spec_helper.name}") %>"></script>
-    <% end %>
-    <style>
-      body {
-        font-family: 'Lucida grande', 'sans-serif';
-        background: #f0f0f0;
-        margin: 0;
-        padding: 0;
-      }
-      a {
-        color: #00A500;
-      }
+<div id="page">
+  <h1>Evergreen</h1>
+  <a class="back" href="<%= url("/list") %>">Back to list</a>
+</div>
 
-      .jasmine_reporter {
-        width: 800px;
-        background: white;
-        padding: 20px;
-        min-height: 50px;
-        margin: 30px auto 30px;
-        border: 1px solid #ddd;
-        -moz-border-radius: 3px;
-        width: 800px;
-      }
-      #test {
-        width: 800px;
-        background: white;
-        -moz-border-radius: 3px;
-        padding: 20px;
-        min-height: 50px;
-        margin: 50px auto 30px;
-        border: 1px solid #ddd
-      }
-      #footer {
-        margin: 0 auto 30px;
-        width: 600px;
-        text-align: center;
-        font-size: 13px;
-        color: #aaa;
-      }
-    </style>
-  </head>
-  <body>
-      <div id="test">
-      </div>
-    <script type="text/javascript">
-      (function() {
-        Evergreen.template = <%= @spec.template.to_json %>;
-        var jasmineEnv = jasmine.getEnv();
-        jasmineEnv.addReporter(new jasmine.TrivialReporter());
-        jasmineEnv.addReporter(new Evergreen.ReflectiveReporter());
-        jasmineEnv.execute();
-      })();
-    </script>
-    <div id="footer">
-      Powered by <a href="http://github.com/jnicklas/evergreen">Evergreen</a>.
-      Evergreen is sponsored by <a href="http://elabs.se">Elabs</a>.
-    </div>
-  </body>
-</html>
+<div id="test"></div>
+
+<script type="text/javascript">
+  (function() {
+    Evergreen.driver = <%= @driver.to_json %>;
+    <% @spec.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();
+  })();
+</script>

data/spec/meta_spec.rb

@@ -2,21 +2,30 @@ require 'spec_helper'
 
 describe Evergreen::Runner do
   subject { Evergreen::Runner.new(spec) }
-  let(:root) { File.expand_path('fixtures', File.dirname(__FILE__)) }
+  let(:spec) { Evergreen::Spec.new(root, template) }
 
-  context "with transactions spec" do
-    let(:spec) { Evergreen::Spec.new(root, 'transactions_spec.js') }
-    it { should pass }
-  end
+  context "with standard setup" do
+    let(:root) { File.expand_path('suite1', File.dirname(__FILE__)) }
 
-  context "with spec helper" do
-    let(:spec) { Evergreen::Spec.new(root, 'with_helper_spec.js') }
-    it { should pass }
-  end
+    context "with transactions spec" do
+      let(:template) { 'transactions_spec.js' }
+      it { should pass }
+    end
+
+    context "with spec helper" do
+      let(:template) { 'with_helper_spec.js' }
+      it { should pass }
+    end
+
+    context "with template spec" do
+      let(:template) { 'templates_spec.js' }
+      it { should pass }
+    end
 
-  context "with template spec" do
-    let(:spec) { Evergreen::Spec.new(root, 'templates_spec.js') }
-    it { should pass }
+    context "with slow failing spec" do
+      let(:template) { 'slow_spec.coffee' }
+      it { should_not pass }
+    end
   end
 end
 

data/spec/runner_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Evergreen::Runner do
-  let(:root) { File.expand_path('fixtures', File.dirname(__FILE__)) }
+  let(:root) { File.expand_path('suite1', File.dirname(__FILE__)) }
 
   context "with passing spec" do
     let(:spec) { Evergreen::Spec.new(root, 'testing_spec.js') }

data/spec/spec_helper.rb

@@ -1,11 +1,13 @@
+require 'rubygems'
+require 'bundler/setup'
+
 require 'evergreen'
 require 'rspec'
 
 require 'capybara/dsl'
-require 'capybara/envjs'
 
-Capybara.app = Evergreen.application(File.expand_path('fixtures', File.dirname(__FILE__)))
-Capybara.default_driver = :envjs
+Capybara.app = Evergreen.application(File.expand_path('suite1', File.dirname(__FILE__)))
+Capybara.default_driver = :selenium
 
 module EvergreenMatchers
   class PassSpec # :nodoc:

data/spec/spec_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe Evergreen::Spec do
-  let(:root) { File.expand_path('fixtures', File.dirname(__FILE__)) }
+  let(:root) { File.expand_path('suite1', File.dirname(__FILE__)) }
   subject { Evergreen::Spec.new(root, 'testing_spec.js') }
 
   its(:name) { should == 'testing_spec.js' }
   its(:root) { should == root }
   its(:full_path) { should == "#{root}/spec/javascripts/testing_spec.js" }
-  its(:template_path) { should == "#{root}/spec/javascripts/testing_spec.html" }
   its(:url) { should == "/run/testing_spec.js" }
   its(:contents) { should =~ /describe\('testing'/ }
 
@@ -19,20 +18,11 @@ describe Evergreen::Spec do
     end
   end
 
-  context "with a template" do
-    subject { Evergreen::Spec.new(root, 'templates_spec.js') }
-    its(:template) { should == %(<h1 id="from-template">This is from the template</h1>\n) }
-  end
-
   context "with coffeescript" do
     subject { Evergreen::Spec.new(root, 'coffeescript_spec.coffee') }
     its(:contents) { should =~ /describe\('coffeescript', function/ }
   end
 
-  context "without a template" do
-    its(:template) { should == '' }
-  end
-
   context "with existing spec file" do
     it { should exist }
   end

data/spec/suite1/public/styles.css

@@ -0,0 +1,3 @@
+#from-template {
+  width: 300px;
+}

data/spec/suite1/spec/javascripts/slow_spec.coffee

@@ -0,0 +1,8 @@
+describe 'slow specs', ->
+
+  it "should wait for results to show", ->
+    runs ->
+      expect('foo').toEqual('foo')
+    waits 1000
+    runs ->
+      expect('bar').toEqual('baz')

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

@@ -0,0 +1 @@
+<h1 id="another-template">This is from another template</h1>

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

@@ -0,0 +1,47 @@
+require('/jquery.js');
+stylesheet('/styles.css')
+
+describe('templates', function() {
+
+  describe('with template', function() {
+    template('one_template.html')
+
+    it("should append the template to the test div", function() {
+      expect($('#test h1#from-template').length).toEqual(1);
+    });
+
+    it("should change stuff in one test...", function() {
+      expect($('#test h1#from-template').length).toEqual(1);
+
+      $('#test h1#from-template').attr('id', 'changed');
+
+      expect($('#test h1#changed').length).toEqual(1);
+      expect($('#test h1#from-template').length).toEqual(0);
+    });
+
+    it("... should have been removed before the next starts", function() {
+      expect($('#test h1#changed').length).toEqual(0);
+      expect($('#test h1#from-template').length).toEqual(1);
+    });
+  });
+
+  describe('with another template', function() {
+    template('another_template.html')
+
+    it("should append the template to the test div", function() {
+      expect($('#test h1#another-template').length).toEqual(1);
+    });
+  });
+
+});
+
+describe('stylesheet', function() {
+  template('one_template.html')
+
+  it("should style the template", function() {
+    // Env-js does not have support for stylesheets
+    if (Evergreen.driver != "envjs") {
+      expect(document.getElementById('from-template').offsetWidth).toEqual(300)
+    }
+  });
+});

data/spec/template_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Evergreen::Template do
+  let(:root) { File.expand_path('suite1', File.dirname(__FILE__)) }
+  subject { Evergreen::Template.new(root, 'one_template.html') }
+
+  its(:name) { should == 'one_template.html' }
+  its(:root) { should == root }
+  its(:full_path) { should == "#{root}/spec/javascripts/templates/one_template.html" }
+  its(:contents) { should =~ %r(<h1 id="from\-template">This is from the template</h1>) }
+  describe '.all' do
+    subject { Evergreen::Template.all(root) }
+
+    it "should find all specs in the given root directory" do
+      subject.map(&:name).should include('one_template.html', 'another_template.html')
+    end
+  end
+
+  context "with existing spec file" do
+    it { should exist }
+  end
+
+  context "with missing spec file" do
+    subject { Evergreen::Template.new(root, 'does_not_exist.html') }
+    it { should_not exist }
+  end
+
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-11 00:00:00 +02:00
+date: 2010-08-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,26 +34,10 @@ dependencies:
         version: 0.3.9
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capybara-envjs
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 1
-        - 5
-        version: 0.1.5
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: launchy
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,11 +49,11 @@ dependencies:
         - 5
         version: 0.3.5
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,11 +64,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: json_pure
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,11 +80,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,7 +98,7 @@ dependencies:
         - 15
         version: 2.0.0.beta.15
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: Run Jasmine JavaScript unit tests, integrate them into Ruby applications.
 email: 
 - jonas.nicklas@gmail.com
@@ -126,12 +110,15 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/evergreen/cli.rb
-- lib/evergreen/evergreen.js
 - lib/evergreen/rails.rb
+- lib/evergreen/resources/evergreen.css
+- lib/evergreen/resources/evergreen.js
 - lib/evergreen/runner.rb
 - lib/evergreen/server.rb
 - lib/evergreen/spec.rb
+- lib/evergreen/template.rb
 - lib/evergreen/version.rb
+- lib/evergreen/views/layout.erb
 - lib/evergreen/views/list.erb
 - lib/evergreen/views/spec.erb
 - lib/evergreen.rb
@@ -201,22 +188,26 @@ files:
 - lib/jasmine/src/WaitsForBlock.js
 - lib/tasks/evergreen.rake
 - spec/evergreen_spec.rb
-- spec/fixtures/public/jquery.js
-- spec/fixtures/spec/javascripts/bar_spec.js
-- spec/fixtures/spec/javascripts/coffeescript_spec.coffee
-- spec/fixtures/spec/javascripts/failing_spec.js
-- spec/fixtures/spec/javascripts/foo_spec.js
-- spec/fixtures/spec/javascripts/spec_helper.coffee
-- spec/fixtures/spec/javascripts/spec_helper.js
-- spec/fixtures/spec/javascripts/templates_spec.html
-- spec/fixtures/spec/javascripts/templates_spec.js
-- spec/fixtures/spec/javascripts/testing_spec.js
-- spec/fixtures/spec/javascripts/transactions_spec.js
-- spec/fixtures/spec/javascripts/with_helper_spec.js
 - spec/meta_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
 - spec/spec_spec.rb
+- spec/suite1/public/jquery.js
+- spec/suite1/public/styles.css
+- spec/suite1/spec/javascripts/bar_spec.js
+- spec/suite1/spec/javascripts/coffeescript_spec.coffee
+- spec/suite1/spec/javascripts/failing_spec.js
+- spec/suite1/spec/javascripts/foo_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/one_template.html
+- spec/suite1/spec/javascripts/templates_spec.js
+- spec/suite1/spec/javascripts/testing_spec.js
+- spec/suite1/spec/javascripts/transactions_spec.js
+- spec/suite1/spec/javascripts/with_helper_spec.js
+- spec/template_spec.rb
 - config/routes.rb
 - README.rdoc
 - bin/evergreen

data/spec/fixtures/spec/javascripts/templates_spec.js

@@ -1,23 +0,0 @@
-require('/jquery.js');
-
-describe('templates', function() {
-
-  it("should append the template to the test div", function() {
-    expect($('#test h1#from-template').length).toEqual(1);
-  });
-
-  it("should change stuff in one test...", function() {
-    expect($('#test h1#from-template').length).toEqual(1);
-
-    $('#test h1#from-template').attr('id', 'changed');
-
-    expect($('#test h1#changed').length).toEqual(1);
-    expect($('#test h1#from-template').length).toEqual(0);
-  });
-
-  it("... should have been removed before the next starts", function() {
-    expect($('#test h1#changed').length).toEqual(0);
-    expect($('#test h1#from-template').length).toEqual(1);
-  });
-
-});