opal-spec 0.2.13 → 0.2.14

data/README.md

@@ -23,16 +23,6 @@ describe MyClass do
 end
 ```
 
-### Running specs
-
-Loading these specs in a browser won't just work. You need to run them.
-The best place to do this is inside `spec/spec_helper.rb`, and with a
-simple call:
-
-```ruby
-Opal::Spec::Runner.autorun
-```
-
 ###  Async examples
 
 Examples can be async, and need to be defined as so:

data/Rakefile

@@ -2,4 +2,6 @@ require 'bundler'
 Bundler.require
 
 require 'opal/spec/rake_task'
-Opal::Spec::RakeTask.new(:default)
+Opal::Spec::RakeTask.new(:default) do |s|
+  # ..
+end

data/config.ru

@@ -1,5 +1,8 @@
 require 'bundler'
 Bundler.require
 
-require 'opal/spec/server'
-run Opal::Spec::Server.new
+run Opal::Server.new { |s|
+  s.main = 'opal/spec/sprockets_runner'
+  s.append_path 'spec'
+  s.debug = false
+}

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

@@ -0,0 +1,12 @@
+module OpalTest
+  module Assertions
+
+    def assert(test, msg = "Failed assertion, no message given.")
+      unless test
+        msg = msg.call if Proc === msg
+        raise ExpectationNotMetError, msg
+      end
+      true
+    end    
+  end
+end

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

@@ -1,6 +1,6 @@
 module OpalTest
   class BrowserFormatter
-    CSS = <<-EOS
+    CSS = <<-CSS
 
       body {
         font-size: 14px;
@@ -48,7 +48,7 @@ module OpalTest
       .examples {
         list-style-type: none;
       }
-    EOS
+    CSS
 
     def initialize
       @examples        = []

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

@@ -1,10 +1,10 @@
-# This file is used by Opal::Spec::Server to basically load all spec files that
+# This file is used by Opal::Server to basically load all spec files that
 # can be found in the spec/ directory.
 
 <% require_asset 'opal' %>
 <% require_asset 'opal-spec' %>
 
-<% Dir.glob('spec/**/*.{rb,opal}').each do |s| %>
+<% Dir.glob('spec/**/*_spec.{rb,opal}').each do |s| %>
 <% require_asset s.sub(/^spec\//, '').sub(/\.(rb|opal)$/, '') %>
 <% end %>
 

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

@@ -1,5 +1,8 @@
+require 'opal/spec/assertions'
+
 module OpalTest
   class TestCase
+    include Assertions
 
     def self.test_cases
       @test_cases ||= []

data/lib/opal/spec/rake_task.rb

@@ -1,30 +1,34 @@
 require 'opal/spec'
-require 'opal/spec/server'
 
 module Opal
   module Spec
     class RakeTask
       include Rake::DSL if defined? Rake::DSL
 
-      attr_accessor :name
+      RUNNER = File.expand_path('../../../../vendor/spec_runner.js', __FILE__)
+      PORT = 9999
+      URL = "http://localhost:9999/"
 
-      def initialize(name = 'opal:spec')
-        @name = name
-        define_tasks
-      end
-
-      def define_tasks
+      def initialize(name = 'opal:test', &block)
         desc "Run opal specs in phantomjs"
-        task @name do
+        task name do
           require 'rack'
           require 'webrick'
 
           server = fork do
-            Rack::Server.start(:app => Opal::Spec::Server.new(false), :Port => port,
-              :Logger => WEBrick::Log.new("/dev/null"), :AccessLog => [])
+            s = Opal::Server.new { |s|
+              s.main = 'opal/spec/sprockets_runner'
+              s.append_path 'spec'
+              s.debug = false
+
+              block.call s if block
+            }
+
+            Rack::Server.start(:app => s, :Port => PORT, :AccessLog => [],
+              :Logger => WEBrick::Log.new("/dev/null"))
           end
 
-          system "phantomjs #{runner_path} \"#{url_path}\""
+          system "phantomjs #{RUNNER} \"#{URL}\""
           success = $?.success?
 
           Process.kill(:SIGINT, server)
@@ -33,18 +37,6 @@ module Opal
           exit 1 unless success
         end
       end
-
-      def runner_path
-        File.join(VENDOR_PATH, 'spec_runner.js')
-      end
-
-      def url_path
-        "http://localhost:9999/"
-      end
-
-      def port
-        9999
-      end
     end
   end
 end

data/lib/opal/spec/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Spec
-    VERSION = '0.2.13'
+    VERSION = '0.2.14'
   end
 end

data/lib/opal/spec.rb

@@ -1,11 +1,5 @@
 require 'opal'
 require 'opal/spec/version'
 
-module Opal
-  module Spec
-    VENDOR_PATH = File.join(File.dirname(__FILE__), '..', '..', 'vendor')
-  end
-end
-
 # Just register our opal code path with opal build tools
 Opal.append_path File.join(File.dirname(__FILE__), '..', 'assets', 'javascripts')

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

@@ -107,3 +107,11 @@ describe "pending" do
     raise "otherwise this error would be raised"
   end
 end
+
+describe "A nested group" do
+  describe "inherits group names" do
+    it "examples should pass" do
+      1.should eq(1)
+    end
+  end
+end

data/spec/tests_spec.rb

@@ -0,0 +1,17 @@
+class SimpleTest < OpalTest::TestCase
+  def test_this_should_be_tested
+    :pass.should eq(:pass)
+  end
+
+  def test_should_also_pass
+    1.should == 1
+  end
+
+  def test_simple_assertion
+    assert true
+    assert 42
+
+    lambda { assert nil }.should raise_error(Exception)
+    lambda { assert false }.should raise_error(Exception)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-spec
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies: []
 description: Opal compatible spec library
 email: adam.beynon@gmail.com
@@ -25,6 +25,7 @@ files:
 - config.ru
 - lib/assets/javascripts/opal-spec.rb
 - lib/assets/javascripts/opal/spec.rb
+- lib/assets/javascripts/opal/spec/assertions.rb
 - lib/assets/javascripts/opal/spec/browser_formatter.rb
 - lib/assets/javascripts/opal/spec/expectations.rb
 - lib/assets/javascripts/opal/spec/kernel.rb
@@ -41,13 +42,12 @@ files:
 - lib/opal-spec.rb
 - lib/opal/spec.rb
 - lib/opal/spec/rake_task.rb
-- lib/opal/spec/server.rb
 - lib/opal/spec/version.rb
 - opal-spec.gemspec
 - spec/matchers/be_empty_spec.rb
 - spec/matchers/respond_to_spec.rb
-- spec/specs.rb
-- spec/tests.rb
+- spec/specs_spec.rb
+- spec/tests_spec.rb
 - vendor/spec_runner.js
 homepage: http://opalrb.org
 licenses: []

data/lib/opal/spec/server.rb

@@ -1,23 +0,0 @@
-require 'opal/spec'
-require 'opal'
-
-module Opal
-  module Spec
-
-    # Custom Opal::Server subclass which adds the 'spec' dir as a
-    # directory for testing (adds to load path). Specs run through this
-    # server are not run in debug mode (all scripts loaded in a single
-    # file). This can be overriden in the supplied block.
-    class Server < Opal::Server
-      def initialize(*args, &block)
-        super(*args) do |s|
-          s.append_path 'spec'
-          s.main = 'opal/spec/sprockets_runner'
-          s.debug = false
-
-          yield s if block_given?
-        end
-      end
-    end
-  end
-end

data/spec/tests.rb

@@ -1,9 +0,0 @@
-class SimpleTest < OpalTest::TestCase
-  def test_this_should_be_tested
-    :pass.should eq(:pass)
-  end
-
-  def test_should_also_pass
-    1.should == 1
-  end
-end