chinchilla 0.1.1 → 0.2.0

data/chinchilla.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |gem|
   gem.version       = Chinchilla::VERSION
   gem.authors       = ["tchak"]
   gem.email         = ["paul@chavard.net"]
-  gem.description   = %q{QUnit test runner}
-  gem.summary       = %q{Run QUnit test on Capybara}
+  gem.description   = %q{mocha test runner}
+  gem.summary       = %q{Run mocha test on Capybara}
   gem.homepage      = ""
 
   gem.add_dependency 'capybara'
   gem.add_dependency 'poltergeist'
-  gem.add_dependency 'colorize'
+  gem.add_dependency 'rocha'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/chinchilla/runner.rb

@@ -1,23 +1,18 @@
-require 'chinchilla/runner/example'
-require 'chinchilla/runner/test'
-
 module Chinchilla
   class Runner
-    def self.run(options={})
-      self.new(options).run
+    def self.start(options={})
+      new(options).run
     end
 
+    attr_reader :reporter
+
     def initialize(options)
-      options[:urls] = [options.delete(:url)] if options.has_key?(:url)
       @options = options
+      @reporter = Rocha::Reporter.new(*formatters)
     end
 
-    def io
-      @io ||= @options[:io] || STDOUT
-    end
-
-    def urls
-      @urls ||= @options[:urls] || ['/']
+    def url
+      @url ||= @options[:url] || '/'
     end
 
     def driver
@@ -28,64 +23,54 @@ module Chinchilla
       driver == :poltergeist
     end
 
-    def application
-      @application ||= @options[:application] || default_application
-    end
-
-    def default_application
-      defined?(Rails) ? Rails.application : nil
-    end
-
-    def tests
-      @tests ||= urls.map {|url| Test.new(self, url) }
-    end
-
     def run
-      before = Time.now
-
-      io.puts ""
-      io.puts dots.to_s
-      io.puts ""
-      if failure_messages
-        io.puts failure_messages
-        io.puts ""
-      end
+      session.visit(url)
+
+      events_consumed = 0
+      done = false
+      begin
+        sleep 0.1
+        events = JSON.parse(session.evaluate_script('window.mocha.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
+        end
+      end until done
 
-      seconds = "%.2f" % (Time.now - before)
-      io.puts "Finished in #{seconds} seconds"
-      io.puts "#{examples.size} assertions, #{failed_examples.size} failures"
-      passed?
+      reporter.passed?
+    rescue => e
+      raise e, "Error communicating with browser process: #{e}", e.backtrace
     end
 
-    def examples
-      tests.map { |test| test.examples }.flatten
+    def session
+      @session ||= begin
+        if poltergeist? && !defined?(Capybara::Poltergeist)
+          require "capybara/poltergeist"
+        end
+        Capybara::Session.new(driver, application)
+      end
     end
 
-    def failed_examples
-      examples.select { |example| not example.passed? }
-    end
+    private
 
-    def passed?
-      tests.all? { |test| test.passed? }
+    def application
+      @application ||= @options[:application] || default_application
     end
 
-    def dots
-      tests.map { |test| test.dots }.join
+    def formatters
+      @formatters ||= @options[:formatters] || default_formatters
     end
 
-    def failure_messages
-      unless passed?
-        tests.map { |test| test.failure_messages }.compact.join("\n\n")
-      end
+    def default_application
+      defined?(Rails) ? Rails.application : nil
     end
 
-    def session
-      @session ||= begin
-        if poltergeist? && !defined?(Capybara::Poltergeist)
-          require "capybara/poltergeist"
-        end
-        Capybara::Session.new(driver, application)
-      end
+    def default_formatters
+      [Rocha::Formatter.new(STDOUT)]
     end
   end
 end

data/lib/chinchilla/version.rb

@@ -1,3 +1,3 @@
 module Chinchilla
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/chinchilla.rb

@@ -1,13 +1,9 @@
-require "chinchilla/version"
-
 require "capybara"
-require "colorize"
-
+require "rocha"
 require "chinchilla/runner"
 
-if defined?(::Rails)
-  module Chinchilla
-    class Engine < ::Rails::Engine
-    end
+module Chinchilla
+  def self.start(options={})
+    Runner.start(options)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chinchilla
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -59,7 +59,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: QUnit test runner
+description: mocha test runner
 email:
 - paul@chavard.net
 executables: []
@@ -74,9 +74,6 @@ files:
 - chinchilla.gemspec
 - lib/chinchilla.rb
 - lib/chinchilla/runner.rb
-- lib/chinchilla/runner/example.rb
-- lib/chinchilla/runner/runner.js
-- lib/chinchilla/runner/test.rb
 - lib/chinchilla/version.rb
 homepage: ''
 licenses: []
@@ -90,22 +87,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2808188431047913734
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2808188431047913734
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Run QUnit test on Capybara
+summary: Run mocha test on Capybara
 test_files: []

data/lib/chinchilla/runner/example.rb

@@ -1,23 +0,0 @@
-module Chinchilla
-  class Runner
-    class Example
-      def initialize(row)
-        @row = row
-      end
-
-      def passed?
-        @row['passed']
-      end
-
-      def failure_message
-        unless passed?
-          msg = []
-          msg << "  Failed: #{@row['name']}"
-          msg << "    #{@row['message']}"
-          msg << "    in #{@row['trace']}" if @row['trace']
-          msg.join("\n")
-        end
-      end
-    end
-  end
-end

data/lib/chinchilla/runner/runner.js

@@ -1,40 +0,0 @@
-QUnit.Runner = {
-  done: false,
-  dots: "",
-  results: []
-};
-
-QUnit.Runner.getResults = function() {
-  return JSON.stringify(QUnit.Runner.results);
-};
-
-var currentTest = {};
-QUnit.testDone = function(results) {
-  QUnit.Runner.dots += (results.failed > 0 ? "F" : ".");
-  QUnit.Runner.results.push({
-    name: results.name,
-    passed: results.failed === 0,
-    message: currentTest.message
-  });
-
-  currentTest = {};
-};
-
-QUnit.log = function(results) {
-  if (!results.result) {
-    var message;
-    if (results.message) {
-      message = results.message;
-    } else {
-      message = "Expected '"+results.expected+"', got '"+results.actual+"'";
-    }
-    currentTest.message = message;
-    currentTest.trace = results.source;
-  }
-};
-
-QUnit.done = function(results) {
-  QUnit.Runner.done = true;
-};
-
-QUnit.config.autorun = false;

data/lib/chinchilla/runner/test.rb

@@ -1,85 +0,0 @@
-module Chinchilla
-  class Runner
-    class Test
-      attr_reader :runner, :url
-
-      def initialize(runner, url)
-        @runner = runner
-        @url = url
-      end
-
-      def session
-        runner.session
-      end
-
-      def io
-        runner.io
-      end
-
-      def run
-        io.puts dots
-        io.puts failure_messages
-        io.puts "\n#{examples.size} assertions, #{failed_examples.size} failures"
-        passed?
-      end
-
-      def colorize_dots(dots)
-        dots = dots.chars.map do |d|
-          case d
-          when 'E', 'F'; d.red
-          when 'P'; d.yellow
-          when '.'; d.green
-          else;     d
-          end
-        end
-        dots.join ''
-      end
-
-      def examples
-        @results ||= begin
-          session.visit(url)
-
-          session.execute_script(runner_js)
-
-          dots_printed = 0
-
-          begin
-            sleep 0.1
-            done, dots = session.evaluate_script('[QUnit.Runner.done, QUnit.Runner.dots]')
-            if dots
-              io.write colorize_dots(dots[dots_printed..-1])
-              io.flush
-              dots_printed = dots.length
-            end
-          end until done
-
-          JSON.parse(session.evaluate_script('QUnit.Runner.getResults()')).map do |row|
-            Example.new(row)
-          end
-        end
-      end
-
-      def runner_js
-        "(function() {"+File.read(File.expand_path("../runner.js", __FILE__))+"})();"
-      end
-
-      def failed_examples
-        examples.select { |example| not example.passed? }
-      end
-
-      def passed?
-        examples.all? { |example| example.passed? }
-      end
-
-      def dots
-        examples; ""
-      end
-
-      def failure_messages
-        unless passed?
-          examples.map { |example| example.failure_message }.compact.join("\n\n")
-        end
-      end
-    end
-  end
-end