konacha 0.9.0 → 0.9.1

data/.gitignore

@@ -1,3 +1,4 @@
+bin
 *.gem
 *.rbc
 .bundle

data/History.md

@@ -0,0 +1,14 @@
+# master
+
+# 0.9.1
+
+* Support foo_spec.coffee files (without .js)
+* Rename Konacha::Spec#basename to #asset_name
+* Switch default port to 3500 to avoid collisions with HTTP proxies (like Charles)
+* Update vendored copies of mocha (0.14.0+) and chai (0.4.2+)
+* Do not require spec dependencies multiple times (#3)
+* Support running a subset of specs via a subdirectory path
+
+# 0.9.0
+
+* Initial release

data/README.md

@@ -6,8 +6,8 @@ assertion library.
 
 [![Konacha][2]][1]
 
-  [1]: http://en.wikipedia.org/wiki/Konacha_tea
-  [2]: vendor/assets/images/konacha.jpg
+  [1]: http://en.wikipedia.org/wiki/Konacha
+  [2]: https://github.com/jfirebaugh/konacha/raw/master/vendor/assets/images/konacha.jpg
 
 It is similar to [Jasmine](https://github.com/pivotal/jasmine-gem) and
 [Evergreen](https://github.com/jnicklas/evergreen), but does not attempt to be framework
@@ -16,20 +16,12 @@ the asset pipeline and engines.
 
 ## Installation
 
-Add konacha to the `:test` and `:development` groups in the Gemfile:
+Add konacha to the `:test` and `:development` groups in the Gemfile and `bundle install`:
 
     group :test, :development do
       gem "konacha"
     end
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install konacha
-
 ## Usage
 
 Create a `spec/javascripts` directory and name the files in it with a `_spec` suffix.
@@ -65,8 +57,9 @@ Or, if you prefer CoffeeScript, in `spec/javascripts/array_sum_spec.js.coffee`:
         [1,2,3].sum().should.equal(6)
 
 The `konacha:server` rake task starts a server for your tests. You can go to the root
-page to run all specs (e.g. `http://localhost:8888/`), or a sub page to run an individual
-spec file (e.g. `http://localhost:8888/array_sum_spec`).
+page to run all specs (e.g. `http://localhost:3500/`), a sub page to run an individual
+spec file (e.g. `http://localhost:3500/array_sum_spec`), or a path to a subdirectory to
+run a subset of specs (e.g. `http://localhost:3500/models`).
 
 Alternatively, you can run the specs headlessly with the `konacha:ci` task.
 
@@ -180,14 +173,6 @@ And your spec:
       });
     });
 
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
 ## License
 
 Copyright (c) 2012 John Firebaugh

data/Vendorfile

@@ -0,0 +1,5 @@
+folder 'vendor/assets' do
+  file 'javascripts/chai.js',   'https://raw.github.com/logicalparadox/chai/master/chai.js'
+  file 'javascripts/mocha.js',  'https://raw.github.com/visionmedia/mocha/master/mocha.js'
+  file 'stylesheets/mocha.css', 'https://raw.github.com/visionmedia/mocha/master/mocha.css'
+end

data/app/controllers/konacha/specs_controller.rb

@@ -1,22 +1,11 @@
 module Konacha
   class SpecsController < ActionController::Base
-    before_filter :set_interface, :set_mode
-
-    def set_interface
-      @interface = Konacha.interface
-    end
-
-    def set_mode
-      @mode = Konacha.mode
-    end
-
-    def index
-      @specs = Konacha::Spec.all
+    rescue_from Konacha::Spec::NotFound do
+      render :text => "Not found", :status => 404
     end
 
-    def show
-      @spec = Konacha::Spec.find(params[:spec])
-      @spec or render :text => "Not Found", :status => 404
+    def specs
+      @specs = Konacha::Spec.find(params[:path] || "")
     end
   end
 end

data/app/helpers/konacha/specs_helper.rb

@@ -0,0 +1,11 @@
+module Konacha
+  module SpecsHelper
+    def spec_include_tag(*specs)
+      assets = specs.map do |spec|
+        asset_paths.asset_for(spec.asset_name, "js").to_a
+      end.flatten.uniq.map(&:logical_path)
+
+      javascript_include_tag *assets, :body => true
+    end
+  end
+end

data/app/models/konacha/spec.rb

@@ -1,11 +1,14 @@
 module Konacha
   class Spec
+    class NotFound < StandardError
+    end
+
     def self.all
       Konacha.spec_paths.map { |path| new(path) }
     end
 
-    def self.find(basename)
-      all.find { |spec| spec.basename == basename }
+    def self.find(path)
+      all.select { |s| s.path.starts_with?(path) }.presence or raise NotFound
     end
 
     attr_accessor :path
@@ -15,11 +18,11 @@ module Konacha
     end
 
     def url
-      "/#{basename}"
+      "/#{asset_name}"
     end
 
-    def basename
-      path[/.*(?=\.js.*$)/]
+    def asset_name
+      path.sub(/(\.js|\.coffee).*/, '')
     end
   end
 end

data/app/views/{layouts/konacha → konacha/specs}/specs.html.erb

@@ -4,25 +4,29 @@
     <meta http-equiv="content-type" content="text/html;charset=utf-8" />
     <title>Mocha Tests</title>
     <%= stylesheet_link_tag "mocha" %>
-    <%= javascript_include_tag "jquery", "mocha", "chai", "konacha/#{@mode}" %>
+    <%= stylesheet_link_tag "konacha" %>
+    <%= javascript_include_tag "jquery", "mocha", "chai", "konacha/#{Konacha.mode}" %>
     <script>
-      mocha.setup(<%= raw @interface.to_json %>);
+      mocha.setup(<%= raw Konacha.interface.to_json %>);
       var expect = chai.expect,
           should = chai.should(),
           assert = chai.assert;
-      window.onload = mocha.run;
 
-      <% if @interface == :bdd %>
+      window.onload = function () {
+        mocha.run(Konacha.Reporter);
+      };
+
+      <% if Konacha.interface == :bdd %>
         beforeEach(function() {
           document.getElementById('test').innerHTML = "";
         });
-      <% elsif @interface == :tdd %>
+      <% elsif Konacha.interface == :tdd %>
         setup(function() {
           document.getElementById('test').innerHTML = "";
         });
       <% end %>
     </script>
-    <%= yield %>
+    <%= spec_include_tag *@specs %>
   </head>
   <body>
     <div id="mocha"></div>

data/config/routes.rb

@@ -1,4 +1,4 @@
 Konacha::Engine.routes.draw do
-  match "/"      => "konacha/specs#index"
-  match "/*spec" => "konacha/specs#show"
+  match "/"     => "konacha/specs#specs"
+  match "*path" => "konacha/specs#specs"
 end

data/konacha.gemspec

@@ -3,8 +3,8 @@
 Gem::Specification.new do |gem|
   gem.authors       = ["John Firebaugh"]
   gem.email         = ["john.firebaugh@gmail.com"]
-  gem.description   = %q{Unit test your Rails JavaScript with the mocha test framework and chai assertion library}
-  gem.summary       = %q{Konacha is a Rails engine that allows you to test your JavaScript with the
+  gem.summary       = %q{Unit-test your Rails JavaScript with the mocha test framework and chai assertion library}
+  gem.description   = %q{Konacha is a Rails engine that allows you to test your JavaScript with the
 mocha test framework and chai assertion library.
 
 It is similar to Jasmine and Evergreen, but does not attempt to be framework
@@ -17,7 +17,7 @@ the asset pipeline and engines.}
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "konacha"
   gem.require_paths = ["lib"]
-  gem.version       = "0.9.0"
+  gem.version       = "0.9.1"
 
   gem.add_dependency "jquery-rails"
   gem.add_dependency "rails", "~> 3.1"
@@ -27,4 +27,5 @@ the asset pipeline and engines.}
   gem.add_development_dependency "capybara-firebug", "~> 1.1"
   gem.add_development_dependency "coffee-script"
   gem.add_development_dependency "ejs"
+  gem.add_development_dependency "vendorer"
 end

data/lib/konacha/engine.rb

@@ -8,7 +8,9 @@ module Konacha
           run app.assets
         end
 
-        run Konacha::Engine
+        map "/" do
+          run Konacha::Engine
+        end
       end
     end
 
@@ -20,7 +22,7 @@ module Konacha
       options = app.config.konacha
 
       options.spec_dir    ||= "spec/javascripts"
-      options.port        ||= 8888
+      options.port        ||= 3500
       options.interface   ||= :bdd
       options.application ||= self.class.application(app)
       options.driver      ||= :selenium

data/spec/controllers/specs_controller_spec.rb

@@ -5,40 +5,16 @@ describe Konacha::SpecsController do
     @routes = Konacha::Engine.routes
   end
 
-  describe "#set_interface" do
-    it "assigns Konacha.interface to @interface" do
-      Konacha.should_receive(:interface) { :tdd }
-      subject.set_interface
-      assigns[:interface].should == :tdd
-    end
-  end
-
-  describe "#set_mode" do
-    it "assigns Konacha.mode to @mode" do
-      Konacha.should_receive(:mode) { :runner }
-      subject.set_mode
-      assigns[:mode].should == :runner
-    end
-  end
-
-  describe "#index" do
-    it "assigns Konacha::Spec.all to @specs" do
-      Konacha::Spec.should_receive(:all) { :all }
-      get :index
-      assigns[:specs].should == :all
-    end
-  end
-
-  describe "#show" do
-    it "finds the spec with the given basename and assigns it to @spec" do
-      Konacha::Spec.should_receive(:find).with("array_spec") { :spec }
-      get :show, :spec => "array_spec"
-      assigns[:spec].should == :spec
+  describe "#specs" do
+    it "assigns the result of Spec.find to @specs" do
+      Konacha::Spec.should_receive(:find).with("spec_path") { :spec }
+      get :specs, :path => "spec_path"
+      assigns[:specs].should == :spec
     end
 
-    it "404s if there is no spec with the given basename" do
-      Konacha::Spec.should_receive(:find).with("array_spec") { nil }
-      get :show, :spec => "array_spec"
+    it "404s if there is no match for the given path" do
+      Konacha::Spec.should_receive(:find).with("array_spec") { raise Konacha::Spec::NotFound }
+      get :specs, :path => "array_spec"
       response.status.should == 404
       response.should_not render_template("konacha/specs/show")
     end

data/spec/dummy/spec/javascripts/test_element_spec.js.coffee

@@ -0,0 +1,10 @@
+describe "the #test element", ->
+  it "can have content added in one test...", ->
+    $('#test').append('<h1 id="added">New Stuff</h1>')
+    $('#test h1#added').length.should.equal(1)
+
+  it "... that is removed before the next starts", ->
+    $('#test h1#added').length.should.equal(0)
+
+  it "is visible", ->
+    $('#test').is(':visible').should.be.true

data/spec/models/spec_spec.rb

@@ -1,17 +1,18 @@
 require 'spec_helper'
 
 describe Konacha::Spec do
-  describe "#basename" do
-    it "is the basename of the path" do
-      described_class.new("array_spec.js").basename.should == "array_spec"
+  describe "#asset_name" do
+    it "is the asset_name of the path" do
+      described_class.new("array_spec.js").asset_name.should == "array_spec"
+      described_class.new("array_spec.coffee").asset_name.should == "array_spec"
     end
 
     it "ignores multiple extensions" do
-      described_class.new("array_spec.js.coffee").basename.should == "array_spec"
+      described_class.new("array_spec.js.coffee").asset_name.should == "array_spec"
     end
 
     it "includes relative path" do
-      described_class.new("subdirectory/array_spec.js").basename.should == "subdirectory/array_spec"
+      described_class.new("subdirectory/array_spec.js").asset_name.should == "subdirectory/array_spec"
     end
   end
 
@@ -30,16 +31,27 @@ describe Konacha::Spec do
   end
 
   describe ".find" do
-    it "returns the Spec with the given basename" do
-      all = [described_class.new("a_spec.js"),
-             described_class.new("b_spec.js")]
-      described_class.should_receive(:all) { all }
-      described_class.find("b_spec").should == all[1]
+    it "returns all Specs if given an empty path" do
+      all = ["a_spec.js", "b_spec.js"]
+      Konacha.should_receive(:spec_paths) { all }
+      described_class.find("").map(&:path).should == all
     end
 
-    it "returns nil if no such spec exists" do
-      described_class.should_receive(:all) { [] }
-      described_class.find("b_spec").should be_nil
+    it "returns an array containing the Spec with the given asset_name" do
+      all = ["a_spec.js", "b_spec.js"]
+      Konacha.should_receive(:spec_paths) { all }
+      described_class.find("b_spec").map(&:path).should == [all[1]]
+    end
+
+    it "returns Specs that are children of the given path" do
+      all = ["a/a_spec_1.js", "a/a_spec_2.js", "b/b_spec.js"]
+      Konacha.should_receive(:spec_paths) { all }
+      described_class.find("a").map(&:path).should == all[0..1]
+    end
+
+    it "raises NotFound if no Specs match" do
+      Konacha.should_receive(:spec_paths) { [] }
+      expect { described_class.find("b_spec") }.to raise_error(Konacha::Spec::NotFound)
     end
   end
 end

data/spec/runner_spec.rb

@@ -15,14 +15,19 @@ describe Konacha::Runner do
     it "prints results to the output" do
       buffer.rewind
       results = buffer.read
-      results.should include(".......F.....")
-      results.should include("expected 4 to equal 5")
-      results.should include("13 examples, 1 failure")
+      # "should include" gives us nice multi-line error messages if there is
+      # more than one failure
+      results.should include 'examples, 1 failure'
+      # Failure output present?
+      results.should include 'F'
+      results.should include 'expected 4 to equal 5'
+      # Enough examples run?
+      results.should match /[1-9][0-9]+ examples, 1 failure/
     end
   end
 
   describe "#run_spec" do
-    let(:spec) { Konacha::Spec.find("failing_spec") }
+    let(:spec) { Konacha::Spec.find("failing_spec").first }
     before { runner.spec_runner(spec).run }
 
     it "prints results to the output" do

data/spec/server_spec.rb

@@ -33,6 +33,12 @@ describe Konacha::Server, :type => :request do
     page.should have_css(".test.pass")
   end
 
+  it "serves a subdirectory of specs" do
+    visit "/subdirectory"
+    page.should have_content("spec in subdirectory")
+    page.should have_css(".test.pass")
+  end
+
   it "supports spec helpers" do
     visit "/spec_helper_spec"
     page.should have_content("two_plus_two")

data/spec/spec_helper.rb

@@ -4,9 +4,9 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rspec/rails"
 require "rspec/autorun"
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+# Preload to avoid occasional tilt warnings about thread safety
+require "coffee_script"
+require "ejs"
 
 require "capybara/rails"
 require "capybara/firebug"
@@ -16,3 +16,22 @@ Capybara.configure do |config|
   config.default_driver   = :selenium_with_firebug
   config.app              = Konacha.application
 end
+
+module SpecDoubleHelpers
+  def asset_double(asset_name, dependencies = [])
+    asset = double("asset called '#{asset_name}'")
+    asset.stub(:to_a).and_return([dependencies, asset].flatten)
+    asset.stub(:logical_path).and_return(asset_name)
+    view.asset_paths.stub(:asset_for).with(asset_name, "js").and_return(asset)
+    asset
+  end
+
+  def spec_double(asset_name, dependencies = [])
+    asset_double(asset_name, dependencies)
+    double("spec called '#{asset_name}'", :asset_name => asset_name)
+  end
+end
+
+RSpec.configure do |config|
+  config.include SpecDoubleHelpers, :type => :view
+end

data/spec/views/specs/specs.html.erb_spec.rb

@@ -1,15 +1,45 @@
 require 'spec_helper'
 
-describe "layouts/konacha/specs" do
+describe "konacha/specs/specs" do
   it "sets up the specified interface" do
-    assign(:interface, :tdd)
+    Konacha.should_receive(:interface).any_number_of_times { :tdd }
     render
     rendered.should include('mocha.setup("tdd")')
   end
 
   it "includes konacha JS for given mode" do
-    assign(:mode, :runner)
+    Konacha.should_receive(:mode).any_number_of_times { :runner }
     render
     rendered.should have_css("script[src='/assets/konacha/runner.js']")
   end
+
+  let(:dependency) { asset_double("dependency") }
+
+  it "renders a script tag for each spec in @specs" do
+    assign(:specs, [spec_double("a_spec"),
+                    spec_double("b_spec")])
+
+    render
+
+    rendered.should have_selector("script[src='/assets/a_spec.js?body=1']")
+    rendered.should have_selector("script[src='/assets/b_spec.js?body=1']")
+  end
+
+  it "renders a script tag for a spec's dependencies" do
+    assign(:specs, [spec_double("spec", [dependency])])
+
+    render
+
+    rendered.should have_selector("script[src='/assets/dependency.js?body=1']")
+    rendered.should have_selector("script[src='/assets/spec.js?body=1']")
+  end
+
+  it "renders only one script tag for common dependencies" do
+    assign(:specs, [spec_double("a_spec", [dependency]),
+                    spec_double("b_spec", [dependency])])
+
+    render
+
+    rendered.should have_selector("script[src='/assets/dependency.js?body=1']", :count => 1)
+  end
 end