RubyGems - konacha - Versions diffs - 2.0.0.beta3 → 2.0.0 - Mend

konacha 2.0.0.beta3 → 2.0.0

Files changed (18) hide show

data/app/assets/javascripts/konacha/iframe.js +1 -0
data/app/assets/javascripts/konacha/parent.js +4 -0
data/app/assets/javascripts/konacha/runner.js +3 -1
data/app/controllers/konacha/specs_controller.rb +2 -2
data/app/models/konacha/spec.rb +8 -10
data/app/views/konacha/specs/iframe.html.erb +2 -2
data/app/views/konacha/specs/parent.html.erb +1 -1
data/config/routes.rb +2 -3
data/konacha.gemspec +1 -1
data/lib/konacha/reporter.rb +5 -1
data/lib/konacha/runner.rb +15 -20
data/spec/controllers/specs_controller_spec.rb +6 -6
data/spec/models/spec_spec.rb +17 -12
data/spec/reporter/metadata_spec.rb +1 -1
data/spec/reporter_spec.rb +12 -1
data/spec/runner_spec.rb +5 -0
data/spec/views/specs/iframe.html.erb_spec.rb +15 -16
metadata +9 -6

data/app/assets/javascripts/konacha/iframe.js CHANGED Viewed

@@ -11,6 +11,7 @@ window.mocha = Object.create(parent.mocha);
 // In order to isolate top-level before/beforeEach hooks,
 // the specs in each iframe are wrapped in an anonymous suite.
 mocha.suite = Mocha.Suite.create(mocha.suite);
+mocha.suite.path = document.documentElement.getAttribute("data-path");
 // Override mocha.ui so that the pre-require event is emitted
 // with the iframe's `window` reference, rather than the parent's.

data/app/assets/javascripts/konacha/parent.js CHANGED Viewed

@@ -1,4 +1,8 @@
 window.onload = function () {
+  mocha.suite.suites.sort(function (a, b) {
+    return a.path.localeCompare(b.path);
+  });
   var iframes = document.getElementsByTagName('iframe');
   for (var i = 0; i < iframes.length; ++i) {
     if (!iframes[i].contentWindow.mocha) {

data/app/assets/javascripts/konacha/runner.js CHANGED Viewed

@@ -35,7 +35,9 @@ mocha.reporter(function(runner) {
   Mocha.reporters.Base.call(this, runner);
   runner.on('start', function() {
-    Konacha.events = [];
+    Konacha.events = [
+      {event:'start', testCount:runner.total, data:{}}
+    ];
   });
   runner.on('suite', function(suite) {

data/app/controllers/konacha/specs_controller.rb CHANGED Viewed

@@ -5,11 +5,11 @@ module Konacha
     end
     def parent
-      @specs = Konacha::Spec.find(params[:path] || "")
+      @specs = Konacha::Spec.all(params[:path])
     end
     def iframe
-      @specs = Konacha::Spec.find(params[:path])
+      @spec = Konacha::Spec.find_by_name(params[:name])
       @stylesheets = Konacha::Engine.config.konacha.stylesheets
     end
   end

data/app/models/konacha/spec.rb CHANGED Viewed

@@ -3,16 +3,18 @@ module Konacha
     class NotFound < StandardError
     end
-    def self.all
+    def self.all(path = nil)
       paths = Konacha.spec_paths
-      if ENV["SPEC"]
-        paths =  ENV["SPEC"].split(",")
+      paths = ENV["SPEC"].split(",") if ENV["SPEC"]
+      paths = paths.map { |p| new(p) }
+      if path.present?
+        paths = paths.select { |s| s.path.starts_with?(path) }.presence or raise NotFound
       end
-      paths.map {|path| new(path)}
+      paths
     end
-    def self.find(path)
-      all.select { |s| s.path.starts_with?(path) }.presence or raise NotFound
+    def self.find_by_name(name)
+      all.find { |s| s.asset_name == name } or raise NotFound
     end
     attr_accessor :path
@@ -21,10 +23,6 @@ module Konacha
       @path = path
     end
-    def url
-      "/iframe/#{asset_name}"
-    end
     def asset_name
       path.sub(/(\.js|\.coffee).*/, '')
     end

data/app/views/konacha/specs/iframe.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html data-path="<%= @spec.path %>">
   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8" />
     <title>Konacha Tests</title>
@@ -11,7 +11,7 @@
     <%= javascript_include_tag "chai", "konacha/iframe", :debug => false %>
-    <%= spec_include_tag *@specs %>
+    <%= spec_include_tag @spec %>
   </head>
   <body>
   </body>

data/app/views/konacha/specs/parent.html.erb CHANGED Viewed

@@ -9,7 +9,7 @@
   </head>
   <body>
     <% @specs.each do |spec| %>
-      <%= content_tag :iframe, '', :src => spec.url, :class => 'test-context', "data-path" => spec.path %>
+      <%= content_tag :iframe, "", :src => "/iframe/#{spec.asset_name}", :class => "test-context", "data-path" => spec.path %>
     <% end %>
     <div id="mocha"></div>
   </body>

data/config/routes.rb CHANGED Viewed

@@ -1,6 +1,5 @@
 Konacha::Engine.routes.draw do
-  match '/iframe'       => 'specs#iframe', :as => 'iframe'
-  match '/iframe/*path' => 'specs#iframe'
-  match '/'             => 'specs#parent', :as => 'parent'
+  match '/iframe/*name' => 'specs#iframe'
+  match '/'             => 'specs#parent'
   match '*path'         => 'specs#parent'
 end

data/konacha.gemspec CHANGED Viewed

@@ -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       = "2.0.0.beta3"
+  gem.version       = "2.0.0"
   gem.add_dependency "railties", "~> 3.1"
   gem.add_dependency "actionpack", "~> 3.1"

data/lib/konacha/reporter.rb CHANGED Viewed

@@ -53,7 +53,11 @@ module Konacha
     end
     def process_mocha_event(event)
-      if event['type']
+      if event['event'] == 'start'
+        start(event['testCount'])
+      elsif event['event'] == 'end'
+        finish
+      elsif event['type']
         object = update_or_create_object(event['data'], event['type'])
         process_event EVENT_CONVERSIONS[event['event']], object
       end

data/lib/konacha/runner.rb CHANGED Viewed

@@ -13,31 +13,26 @@ module Konacha
     end
     def run
-      reporter.start
+      session.visit('/')
+      events_consumed = 0
+      done = false
       begin
-        session.visit('/')
-        events_consumed = 0
-        done = false
-        begin
-          sleep 0.1
-          events = JSON.parse(session.evaluate_script('Konacha.getEvents()'))
-          if events
-            events[events_consumed..-1].each do |event|
-              done = true if event['event'] == 'end'
-              reporter.process_mocha_event(event)
-            end
-            events_consumed = events.length
+        sleep 0.1
+        events = JSON.parse(session.evaluate_script('Konacha.getEvents()'))
+        if events
+          events[events_consumed..-1].each do |event|
+            done = true if event['event'] == 'end'
+            reporter.process_mocha_event(event)
           end
-        end until done
-      rescue => e
-        raise e, "Error communicating with browser process: #{e}", e.backtrace
-      end
-      reporter.finish
+          events_consumed = events.length
+        end
+      end until done
       reporter.passed?
+    rescue => e
+      raise e, "Error communicating with browser process: #{e}", e.backtrace
     end
     def session

data/spec/controllers/specs_controller_spec.rb CHANGED Viewed

@@ -6,15 +6,15 @@ describe Konacha::SpecsController do
   end
   describe "#iframe" do
-    it "assigns the result of Spec.find to @specs" do
-      Konacha::Spec.should_receive(:find).with("spec_path") { :spec }
-      get :iframe, :path => "spec_path"
-      assigns[:specs].should == :spec
+    it "assigns the result of Spec.find_by_name to @spec" do
+      Konacha::Spec.should_receive(:find_by_name).with("spec_name") { :spec }
+      get :iframe, :name => "spec_name"
+      assigns[:spec].should == :spec
     end
     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 :iframe, :path => "array_spec"
+      Konacha::Spec.should_receive(:find_by_name).with("array_spec") { raise Konacha::Spec::NotFound }
+      get :iframe, :name => "array_spec"
       response.status.should == 404
       response.should_not render_template("konacha/specs/iframe")
     end

data/spec/models/spec_spec.rb CHANGED Viewed

@@ -16,12 +16,6 @@ describe Konacha::Spec do
     end
   end
-  describe "#url" do
-    it "returns a URL path" do
-      described_class.new("array_spec.js").url.should include "array_spec"
-    end
-  end
   describe ".all" do
     it "returns an array of specs" do
       Konacha.should_receive(:spec_paths) { ["a_spec.js", "b_spec.js"] }
@@ -37,30 +31,41 @@ describe Konacha::Spec do
       paths =~ %w{foo_spec bar_spec baz_spec}
       ENV["SPEC"] = nil
     end
-  end
-  describe ".find" do
     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
+      described_class.all("").map(&:path).should == all
     end
     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]]
+      described_class.all("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]
+      described_class.all("a").map(&:path).should == all[0..1]
+    end
+    it "raises NotFound if no Specs match" do
+      Konacha.should_receive(:spec_paths) { [] }
+      expect { described_class.all("b_spec") }.to raise_error(Konacha::Spec::NotFound)
+    end
+  end
+  describe ".find_by_name" do
+    it "returns the spec with the given asset name" do
+      all = ["a_spec.js", "b_spec.js"]
+      Konacha.should_receive(:spec_paths) { all }
+      described_class.find_by_name("a_spec").path.should == "a_spec.js"
     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)
+      expect { described_class.find_by_name("b_spec") }.to raise_error(Konacha::Spec::NotFound)
     end
   end
 end

data/spec/reporter/metadata_spec.rb CHANGED Viewed

@@ -37,7 +37,7 @@ describe Konacha::Reporter::Metadata do
   describe "#execution_result" do
     it "returns a hash with execution details" do
-      subject.execution_result.keys.sort.should == [:exception, :finished_at, :run_time, :started_at, :status]
+      subject.execution_result.keys.map(&:to_s).sort.should == [:exception, :finished_at, :run_time, :started_at, :status].map(&:to_s)
     end
   end

data/spec/reporter_spec.rb CHANGED Viewed

@@ -47,8 +47,19 @@ describe Konacha::Reporter do
   end
   describe "#process_mocha_event" do
+    before { subject.stub(:process_event) }
+    it "calls #start if passed the start event" do
+      subject.should_receive(:start).with(4)
+      subject.process_mocha_event({'event' => 'start', 'testCount' => 4})
+    end
+    it "calls #finish if passed the end event" do
+      subject.should_receive(:finish)
+      subject.process_mocha_event({'event' => 'end'})
+    end
     it "creates the object" do
-      subject.stub(:process_event)
       subject.should_receive(:update_or_create_object).with('data', 'type')
       subject.process_mocha_event({'data' => 'data', 'type' => 'type'})
     end

data/spec/runner_spec.rb CHANGED Viewed

@@ -86,13 +86,18 @@ describe Konacha::Runner do
          'status'          => 'pending'}}
     end
+    let(:start)     { {'event' => 'start', 'testCount' => kind_of(Integer), 'data' => {} } }
+    let(:end_event) { {'event' => 'end', 'data' => {} } }
     it "passes along the right events" do
+      subject.reporter.should_receive(:process_mocha_event).with(start)
       subject.reporter.should_receive(:process_mocha_event).with(suite)
       subject.reporter.should_receive(:process_mocha_event).with(suite_end)
       subject.reporter.should_receive(:process_mocha_event).with(test)
       subject.reporter.should_receive(:process_mocha_event).with(failure)
       subject.reporter.should_receive(:process_mocha_event).with(pass)
       subject.reporter.should_receive(:process_mocha_event).with(pending)
+      subject.reporter.should_receive(:process_mocha_event).with(end_event)
       subject.reporter.should_receive(:process_mocha_event).any_number_of_times
       subject.run
     end

data/spec/views/specs/iframe.html.erb_spec.rb CHANGED Viewed

@@ -15,23 +15,21 @@ describe "konacha/specs/iframe" do
   def spec_double(asset_name, dependencies = [])
     asset_double(asset_name, dependencies)
-    double("spec called '#{asset_name}'", :asset_name => asset_name)
+    double("spec called '#{asset_name}'", :asset_name => asset_name, :path => "#{asset_name}.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")])
+  it "renders a script tag for @spec" do
+    assign(:spec, spec_double("a_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])])
+    assign(:spec, spec_double("spec", [dependency]))
     render
@@ -39,20 +37,11 @@ describe "konacha/specs/iframe" do
     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
   it "renders only one script tag for dependencies of dependencies" do
     dependency_a = asset_double("dependency_a")
     dependency_b = asset_double("dependency_b", [dependency_a])
-    assign(:specs, [spec_double("a_spec", [dependency_a, dependency_b])])
+    assign(:spec, spec_double("a_spec", [dependency_a, dependency_b]))
     render
@@ -61,11 +50,21 @@ describe "konacha/specs/iframe" do
   end
   it "render the stylesheets" do
+    assign(:spec, spec_double("a_spec"))
     assign(:stylesheets, %w(foo bar))
+    assign(:specs, [])
     render
     rendered.should have_selector("link[href='/assets/foo.css']")
     rendered.should have_selector("link[href='/assets/bar.css']")
   end
+  it "includes a path data attribute" do
+    assign(:spec, spec_double("a_spec"))
+    render
+    rendered.should have_selector("[data-path='a_spec.js']")
+  end
 end

metadata CHANGED Viewed

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
-  prerelease: 6
+  version: 2.0.0
+  prerelease:
 platform: ruby
 authors:
 - John Firebaugh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -293,13 +293,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1614270189281322721
+      hash: 3302802791356111510
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3302802791356111510
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.24