opal-spec 0.2.6 → 0.2.7

data/lib/assets/javascripts/opal/spec/runner.rb

@@ -0,0 +1,80 @@
+module Opal
+  module Spec
+    class Runner
+      def self.in_browser?
+        %x{
+          if (typeof(window) !== 'undefined' && typeof(document) !== 'undefined') {
+            return true;
+          }
+
+          return false;
+        }
+      end
+
+      def self.in_phantom?
+        %x{
+          if (typeof(phantom) !== 'undefined' || typeof(OPAL_SPEC_PHANTOM) !== 'undefined') {
+            return true;
+          }
+
+          return false;
+        }
+      end
+
+      def self.autorun
+        if in_browser?
+          %x{
+            setTimeout(function() {
+              #{ Runner.new.run };
+            }, 0);
+          }
+        else
+          Runner.new.run
+        end
+      end
+
+      def initialize
+        if Runner.in_phantom?
+          @formatter = PhantomFormatter.new
+        elsif Runner.in_browser?
+          @formatter = BrowserFormatter.new
+        end
+      end
+
+      def run
+        @groups = ExampleGroup.example_groups.dup
+        @formatter.start
+        run_next_group
+      end
+
+      def run_next_group
+        if @groups.empty?
+          @formatter.finish
+        else
+          @groups.shift.run self
+        end
+      end
+
+      def example_group_started group
+        @formatter.example_group_started group
+      end
+
+      def example_group_finished group
+        @formatter.example_group_finished group
+        run_next_group
+      end
+
+      def example_started example
+        @formatter.example_started example
+      end
+
+      def example_passed example
+        @formatter.example_passed example
+      end
+
+      def example_failed example
+        @formatter.example_failed example
+      end
+    end
+  end
+end

data/lib/{opal-spec → assets/javascripts/opal/spec}/scratch_pad.rb

@@ -14,4 +14,4 @@ module ScratchPad
   def self.recorded
     @record
   end
-end
+end

data/lib/assets/javascripts/opal/spec.rb

@@ -0,0 +1,13 @@
+#= require opal
+#= require opal/spec/example
+#= require opal/spec/example_group
+#= require opal/spec/matchers
+#= require opal/spec/runner
+#= require opal/spec/scratch_pad
+#= require opal/spec/expectations
+#= require opal/spec/browser_formatter
+#= require opal/spec/phantom_formatter
+#= require opal/spec/kernel
+
+# Compatibility with older versions
+OpalSpec = Opal::Spec

data/lib/assets/javascripts/opal-spec.rb

@@ -0,0 +1 @@
+#= require opal/spec

data/lib/opal/spec/runner.rb

@@ -0,0 +1,12 @@
+module Opal
+  module Spec
+
+    # Run tests on the command line using phantomjs. Phantomjs **must** be
+    # installed, and the runner assumes you have an HTML file at
+    # ./spec/index.html which will be run.
+    def self.runner
+      runner = File.join File.dirname(__FILE__), '..', '..', '..', 'vendor', 'runner.js'
+      system "phantomjs #{runner} spec/index.html"
+    end
+  end
+end

data/lib/opal/spec/version.rb

@@ -0,0 +1,5 @@
+module Opal
+  module Spec
+    VERSION = '0.2.7'
+  end
+end

data/lib/opal/spec.rb

@@ -0,0 +1,9 @@
+require 'opal'
+require 'opal/spec/runner'
+require 'opal/spec/version'
+
+# Compatibility with old namespace
+OpalSpec = Opal::Spec
+
+# Just register our opal code path with opal build tools
+Opal.append_path File.join(File.dirname(__FILE__), '..', 'assets', 'javascripts')

data/lib/opal-spec.rb

@@ -1,10 +1 @@
-require 'opal-spec/example'
-require 'opal-spec/example_group'
-require 'opal-spec/matchers'
-require 'opal-spec/runner'
-require 'opal-spec/scratch_pad'
-require 'opal-spec/expectations'
-require 'opal-spec/browser_formatter'
-require 'opal-spec/phantom_formatter'
-require 'opal-spec/kernel'
-require 'opal-spec/version'
+require 'opal/spec'

data/opal-spec.gemspec

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/opal-spec/version', __FILE__)
+require File.expand_path('../lib/opal/spec/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name         = 'opal-spec'
-  s.version      = OpalSpec::VERSION
+  s.version      = Opal::Spec::VERSION
   s.author       = 'Adam Beynon'
-  s.email        = 'adam@adambeynon.com'
+  s.email        = 'adam.beynon@gmail.com'
   s.homepage     = 'http://opalrb.org'
   s.summary      = 'Opal compatible spec'
   s.description  = 'Opal compatible spec library'
 
   s.files          = `git ls-files`.split("\n")
   s.require_paths  = ['lib']
-end
+end

data/spec/index.html

@@ -1,12 +1,9 @@
 <!DOCTYPE html>
-
 <html>
 <head>
-  <title>opal-spec tests</title>
+  <title>opal-spec specs</title>
 </head>
 <body>
-  <script src="../build/opal.js"></script>
-  <script src="../build/opal-spec.js"></script>
   <script src="../build/specs.js"></script>
 </body>
 </html>

data/spec/{test.rb → specs.rb}

@@ -1,3 +1,6 @@
+#= require opal
+#= require opal-spec
+
 @passed = 0
 @failures = []
 
@@ -68,6 +71,6 @@ describe 'Another group' do
   end
 end
 
-OpalSpec::Runner.autorun
+Opal::Spec::Runner.autorun
 
-puts "Assertions: #{@passed + @failures.length}, Passed: #{@passed}, Failures: #{@failures.length}"
+puts "Assertions: #{@passed + @failures.length}, Passed: #{@passed}, Failures: #{@failures.length}"

data/vendor/runner.js

@@ -0,0 +1,40 @@
+/*
+ * Test runner for phantomjs
+ */
+var args = phantom.args;
+var page = require('webpage').create();
+
+page.onConsoleMessage = function(msg) {
+  console.log(msg);
+};
+
+page.onInitialized = function() {
+  page.evaluate(function () {
+    window.OPAL_SPEC_PHANTOM = true;
+  });
+};
+
+page.open(args[0], function(status) {
+  if (status !== 'success') {
+    console.error("Cannot load: " + args[0]);
+    phantom.exit(1);
+  } else {
+    var timeout = parseInt(args[1] || 60000, 10);
+    var start = Date.now();
+    var interval = setInterval(function() {
+      if (Date.now() > start + timeout) {
+        console.error("Specs timed out");
+        phantom.exit(124);
+      } else {
+        var code = page.evaluate(function() {
+          return window.OPAL_SPEC_CODE;
+        });
+
+        if (code === 0 || code === 1) {
+          clearInterval(interval);
+          phantom.exit(code);
+        }
+      }
+    }, 500);
+  }
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-spec
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-02 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000Z
 dependencies: []
 description: Opal compatible spec library
-email: adam@adambeynon.com
+email: adam.beynon@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -21,20 +21,25 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- lib/assets/javascripts/opal-spec.rb
+- lib/assets/javascripts/opal/spec.rb
+- lib/assets/javascripts/opal/spec/browser_formatter.rb
+- lib/assets/javascripts/opal/spec/example.rb
+- lib/assets/javascripts/opal/spec/example_group.rb
+- lib/assets/javascripts/opal/spec/expectations.rb
+- lib/assets/javascripts/opal/spec/kernel.rb
+- lib/assets/javascripts/opal/spec/matchers.rb
+- lib/assets/javascripts/opal/spec/phantom_formatter.rb
+- lib/assets/javascripts/opal/spec/runner.rb
+- lib/assets/javascripts/opal/spec/scratch_pad.rb
 - lib/opal-spec.rb
-- lib/opal-spec/browser_formatter.rb
-- lib/opal-spec/example.rb
-- lib/opal-spec/example_group.rb
-- lib/opal-spec/expectations.rb
-- lib/opal-spec/kernel.rb
-- lib/opal-spec/matchers.rb
-- lib/opal-spec/phantom_formatter.rb
-- lib/opal-spec/runner.rb
-- lib/opal-spec/scratch_pad.rb
-- lib/opal-spec/version.rb
+- lib/opal/spec.rb
+- lib/opal/spec/runner.rb
+- lib/opal/spec/version.rb
 - opal-spec.gemspec
 - spec/index.html
-- spec/test.rb
+- spec/specs.rb
+- vendor/runner.js
 homepage: http://opalrb.org
 licenses: []
 post_install_message: 
@@ -55,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Opal compatible spec

data/lib/opal-spec/browser_formatter.rb

@@ -1,192 +0,0 @@
-module OpalSpec
-  class BrowserFormatter
-    CSS = <<-EOS
-
-      body {
-        font-size: 14px;
-        font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
-      }
-
-      pre {
-        font-family: "Bitstream Vera Sans Mono", Monaco, "Lucida Console", monospace;
-        font-size: 12px;
-        color: #444444;
-        white-space: pre;
-        padding: 3px 0px 3px 12px;
-        margin: 0px 0px 8px;
-
-        background: #FAFAFA;
-        -webkit-box-shadow: rgba(0,0,0,0.07) 0 1px 2px inset;
-        -webkit-border-radius: 3px;
-        -moz-border-radius: 3px;
-        border-radius: 3px;
-        border: 1px solid #DDDDDD;
-      }
-
-      ul.example_groups {
-        list-style-type: none;
-      }
-
-      li.group.passed .group_description {
-        color: #597800;
-        font-weight: bold;
-      }
-
-      li.group.failed .group_description {
-        color: #FF000E;
-        font-weight: bold;
-      }
-
-      li.example.passed {
-        color: #597800;
-      }
-
-      li.example.failed {
-        color: #FF000E;
-      }
-
-      .examples {
-        list-style-type: none;
-      }
-    EOS
-
-    def initialize
-      @examples        = []
-      @failed_examples = []
-    end
-
-    def start
-      %x{
-        if (!document || !document.body) {
-          #{ raise "Not running in browser." };
-        }
-
-        var summary_element = document.createElement('p');
-        summary_element.className = 'summary';
-        summary_element.innerHTML = "Running...";
-
-        var groups_element = document.createElement('ul');
-        groups_element.className = 'example_groups';
-
-        var target = document.getElementById('opal-spec-output');
-
-        if (!target) {
-          target = document.body;
-        }
-
-        target.appendChild(summary_element);
-        target.appendChild(groups_element);
-
-        var styles = document.createElement('style');
-        styles.type = 'text/css';
-
-        if (styles.styleSheet) {
-          styles.styleSheet.cssText = __scope.CSS;
-        }
-        else {
-          styles.appendChild(document.createTextNode(__scope.CSS));
-        }
-
-        document.getElementsByTagName('head')[0].appendChild(styles);
-      }
-
-      @start_time = Time.now.to_f
-      @groups_element = `groups_element`
-      @summary_element = `summary_element`
-    end
-
-    def finish
-      time = Time.now.to_f - @start_time
-      text = "\n#{example_count} examples, #{@failed_examples.size} failures (time taken: #{time})"
-      `#{@summary_element}.innerHTML = text`
-    end
-
-    def example_group_started group
-      @example_group = group
-      @example_group_failed = false
-
-      %x{
-        var group_element = document.createElement('li');
-
-        var description = document.createElement('span');
-        description.className = 'group_description';
-        description.innerHTML = #{group.description.to_s};
-        group_element.appendChild(description);
-
-        var example_list = document.createElement('ul');
-        example_list.className = 'examples';
-        group_element.appendChild(example_list);
-
-        #@groups_element.appendChild(group_element);
-      }
-
-      @group_element = `group_element`
-      @example_list  = `example_list`
-    end
-
-    def example_group_finished group
-      if @example_group_failed
-        `#@group_element.className = 'group failed';`
-      else
-        `#@group_element.className = 'group passed';`
-      end
-    end
-
-    def example_started example
-      @examples << example
-      @example = example
-    end
-
-    def example_failed example
-      @failed_examples << example
-      @example_group_failed = true
-
-      exception = example.exception
-
-      case exception
-      when OpalSpec::ExpectationNotMetError
-        output  = exception.message
-      else
-        output  = "#{exception.class.name}: #{exception.message}\n"
-        output += "    #{exception.backtrace.join "\n    "}\n"
-      end
-
-      %x{
-        var wrapper = document.createElement('li');
-        wrapper.className = 'example failed';
-
-        var description = document.createElement('span');
-        description.className = 'example_description';
-        description.innerHTML = #{example.description};
-
-        var exception = document.createElement('pre');
-        exception.className = 'exception';
-        exception.innerHTML = output;
-
-        wrapper.appendChild(description);
-        wrapper.appendChild(exception);
-
-        #@example_list.appendChild(wrapper);
-        #@example_list.style.display = 'list-item';
-      }
-    end
-
-    def example_passed example
-      %x{
-        var wrapper = document.createElement('li');
-        wrapper.className = 'example passed';
-
-        var description = document.createElement('span');
-        description.className = 'example_description';
-        description.innerHTML = #{example.description};
-
-        wrapper.appendChild(description);
-        #@example_list.appendChild(wrapper);
-      }
-    end
-
-    def example_count
-      @examples.size
-    end
-  end
-end

data/lib/opal-spec/example.rb

@@ -1,76 +0,0 @@
-module OpalSpec
-  class Example
-    attr_reader :description, :example_group, :exception
-    attr_accessor :asynchronous
-
-    def initialize(group, desc, block)
-      @example_group = group
-      @description   = desc
-      @__block__     = block
-    end
-
-    def finish_running
-      if @exception
-        @example_group.example_failed self
-      else
-        @example_group.example_passed self
-      end
-    end
-
-    def run
-      begin
-        @example_group.example_started self
-        run_before_hooks
-        instance_eval(&@__block__)
-      rescue => e
-        @exception = e
-      ensure
-        run_after_hooks unless @asynchronous
-      end
-
-      if @asynchronous
-        # must wait ...
-      else
-        finish_running
-      end
-    end
-
-    def run_after_hooks
-      begin
-        @example_group.after_hooks.each do |after|
-        instance_eval &after
-        end
-      rescue => e
-        @exception = e
-      end
-    end
-
-    def run_before_hooks
-      @example_group.before_hooks.each do |before|
-        instance_eval &before
-      end
-    end
-
-    def run_async(&block)
-      begin
-        block.call
-      rescue => e
-        @exception = e
-      ensure
-        run_after_hooks
-      end
-
-      finish_running
-    end
-
-    def set_timeout(duration, &block)
-      %x{
-        setTimeout(function() {
-          #{ block.call };
-        }, duration);
-      }
-
-      self
-    end
-  end
-end

data/lib/opal-spec/example_group.rb

@@ -1,92 +0,0 @@
-module OpalSpec
-  class ExampleGroup
-    @example_groups = []
-    def self.example_groups
-      @example_groups
-    end
-
-    @stack = []
-    def self.create desc, block
-      group = self.new desc, @stack.last
-      @example_groups << group
-
-      @stack << group
-      group.instance_eval &block
-      @stack.pop
-    end
-
-    def initialize desc, parent
-      @desc     = desc.to_s
-      @parent   = parent
-      @examples = []
-
-      @before_hooks = []
-      @after_hooks  = []
-    end
-
-    def it(desc, &block)
-      @examples << Example.new(self, desc, block)
-    end
-
-    def async(desc, &block)
-      example = Example.new(self, desc, block)
-      example.asynchronous = true
-      @examples << example
-    end
-
-    def it_behaves_like(*objs)
-    end
-
-    def before type = :each, &block
-      raise "unsupported before type: #{type}" unless type == :each
-      @before_hooks << block
-    end
-
-    def after type = :each, &block
-      raise "unsupported after type: #{type}" unless type == :each
-      @after_hooks << block
-    end
-
-    def before_hooks
-      @parent ? [].concat(@parent.before_hooks).concat(@before_hooks) : @before_hooks
-    end
-
-    def after_hooks
-      @parent ? [].concat(@parent.after_hooks).concat(@after_hooks) : @after_hooks
-    end
-
-    def run(runner)
-      @runner = runner
-      @runner.example_group_started self
-
-      @running_examples = @examples.dup
-      run_next_example
-    end
-
-    def run_next_example
-      if @running_examples.empty?
-        @runner.example_group_finished self
-      else
-        @running_examples.shift.run
-      end
-    end
-
-    def example_started(example)
-      @runner.example_started(example)
-    end
-
-    def example_passed(example)
-      @runner.example_passed(example)
-      run_next_example
-    end
-
-    def example_failed(example)
-      @runner.example_failed(example)
-      run_next_example
-    end
-
-    def description
-      @parent ? "#{@parent.description} #{@desc}" : @desc
-    end
-  end
-end