opal-spec 0.2.10 → 0.2.11

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+## 0.2.11 2013-02-20
+
+*   Added TestCase class to allow unit tests. OpalTest::Spec now inherits from
+    OpalTest::TestCase.
+
+*   Added Spec#let and Spec#subject.
+
+## 0.2.7
+
+*   Can be built using asset pipeline/sprockets.
+*   BrowserFormatter is now default.
+
+## 0.0.3
+
+*   Allow group names to be non-strings.
+*   Nested groups now have outer group name as prefix.
+*   Nested groups should inherit `before` and `after` blocks.
+
+## 0.0.2
+
+*   Added seperate BrowserFormatter class for cleaner output.
+*   Update Rake tasks to use new Opal::Builder class.
+
+## 0.0.1
+
+*   Initial Release.

data/Gemfile

@@ -2,5 +2,3 @@ source :rubygems
 gemspec
 
 gem 'rake'
-gem 'opal'
-gem 'sprockets'

data/README.md

@@ -38,17 +38,17 @@ Opal::Spec::Runner.autorun
 Examples can be async, and need to be defined as so:
 
 ```ruby
-  describe 'MyClass' do
-    # normal, sync example
-    it 'does something' do
-      # ...
-    end
+describe 'MyClass' do
+  # normal, sync example
+  it 'does something' do
+    #...
+  end
 
-    # async example
-    async 'does something else too' do
-      # ...
-    end
+  # async example
+  async 'does something else too' do
+    #...
   end
+end
 ```
 
 This just marks the example as being async. To actually handle the async
@@ -66,26 +66,3 @@ end
 
 The end of the block passed to `run_async` informs opal-spec that you are
 done with this test, so it can move on.
-
-Change Log
-----------
-
-### 0.2.7
-
-* Can be built using asset pipeline/sprockets
-* BrowserFormatter is now default
-
-### 0.0.3
-
-* Allow group names to be non-strings
-* Nested groups now have outer group name as prefix
-* Nested groups should inherit `before` and `after` blocks
-
-### 0.0.2
-
-* Added seperate BrowserFormatter class for cleaner output
-* Update Rake tasks to use new Opal::Builder class
-
-### 0.0.1
-
-Initial release

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

@@ -1,7 +1,7 @@
 require 'opal'
 
-require 'opal/spec/example'
-require 'opal/spec/example_group'
+require 'opal/spec/test_case'
+require 'opal/spec/spec'
 require 'opal/spec/matchers'
 require 'opal/spec/runner'
 require 'opal/spec/scratch_pad'
@@ -11,5 +11,5 @@ require 'opal/spec/phantom_formatter'
 require 'opal/spec/kernel'
 
 module Opal
-  Spec = ::Spec   # Compatibility with older versions
+  Spec = ::OpalTest # compatibility
 end

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

@@ -1,4 +1,4 @@
-module Spec
+module OpalTest
   class BrowserFormatter
     CSS = <<-EOS
 

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

@@ -1,5 +1,4 @@
-
-module Spec
+module OpalTest
   class ExpectationNotMetError < StandardError; end
 
   module Expectations
@@ -7,7 +6,7 @@ module Spec
       if matcher
         matcher.match self
       else
-        Spec::PositiveOperatorMatcher.new self
+        PositiveOperatorMatcher.new self
       end
     end
 
@@ -15,40 +14,40 @@ module Spec
       if matcher
         matcher.not_match self
       else
-        Spec::NegativeOperatorMatcher.new self
+        NegativeOperatorMatcher.new self
       end
     end
 
     def be_kind_of expected
-      Spec::BeKindOfMatcher.new expected
+      BeKindOfMatcher.new expected
     end
 
     def be_nil
-      Spec::BeNilMatcher.new nil
+      BeNilMatcher.new nil
     end
 
     def be_true
-      Spec::BeTrueMatcher.new true
+      BeTrueMatcher.new true
     end
 
     def be_false
-      Spec::BeFalseMatcher.new false
+      BeFalseMatcher.new false
     end
 
     def eq(expected)
-      Spec::EqlMatcher.new expected
+      EqlMatcher.new expected
     end
 
     def equal expected
-      Spec::EqualMatcher.new expected
+      EqualMatcher.new expected
     end
 
     def raise_error expected
-      Spec::RaiseErrorMatcher.new expected
+      RaiseErrorMatcher.new expected
     end
   end
 end
 
 class Object
-  include Spec::Expectations
+  include OpalTest::Expectations
 end

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

@@ -1,6 +1,11 @@
 module Kernel
   def describe(desc, &block)
-    Spec::ExampleGroup.create desc, block
+    group = OpalTest::Spec.create(desc, block)
+
+    stack = OpalTest::Spec.stack
+    stack << group
+    group.class_eval &block
+    stack.pop
   end
 
   def mock(obj)

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

@@ -1,4 +1,4 @@
-module Spec
+module OpalTest
   class Matcher
     def initialize(actual)
       @actual = actual
@@ -62,7 +62,7 @@ module Spec
   class EqlMatcher < Matcher
     def match(expected)
       unless expected == @actual
-        failure "expected: #{expected.inspect}, got: #{@actual.inspect} (using ==)."
+        failure "expected: #{@actual.inspect}, got: #{expected.inspect} (using ==)."
       end
     end
 

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

@@ -1,4 +1,4 @@
-module Spec
+module OpalTest
   class PhantomFormatter
     def initialize
       @examples        = []

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

@@ -1,4 +1,4 @@
-module Spec
+module OpalTest
   class Runner
     def self.in_browser?
       %x{
@@ -41,7 +41,7 @@ module Spec
     end
 
     def run
-      @groups = ExampleGroup.example_groups.dup
+      @groups = TestCase.test_cases.dup
       @formatter.start
       run_next_group
     end

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

@@ -0,0 +1,86 @@
+module OpalTest
+  class Spec < TestCase
+
+    def self.stack
+      @stack ||= []
+    end
+
+    def self.create(desc, block)
+      parent = Spec.stack.last
+
+      Class.new(parent || Spec) do
+        @desc   = desc
+        @parent = parent
+      end
+    end
+
+    def self.to_s
+      "<OpalTest::Spec #{@desc.inspect}>"
+    end
+
+    def self.description
+      @parent ? "#{@parent.description} #{@desc}" : @desc
+    end
+
+    def self.it(desc, &block)
+      @specs ||= 0
+      define_method("test_#{@specs += 1}_#{desc}", &block)
+    end
+
+    def self.async(desc, &block)
+      self.it desc do
+        self.async!
+        instance_eval(&block)
+      end
+    end
+
+    def self.let(name, &block)
+      define_method(name) do
+        @_memoized ||= {}
+        @_memoized.fetch(name) { |n| @_memoized[n] = instance_eval(&block) }
+      end
+    end
+
+    def self.subject(&block)
+      let(:subject, &block)
+    end
+
+    def self.it_behaves_like(*objs)
+    end
+
+    # type is ignored (is always :each)
+    def self.before(type = nil, &block)
+      @setup_hooks << block
+    end
+
+    # type is ignored (is always :each)
+    def self.after(type = nil, &block)
+      @teardown_hooks << block
+    end
+
+    def description
+      @description
+    end
+
+    def async!
+      @asynchronous = true
+    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)
+      `setTimeout(#{block}, #{duration})`      
+      self
+    end
+  end
+end

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

@@ -8,4 +8,4 @@
 <% require_asset s.sub(/^spec\//, '').sub(/\.(rb|opal)$/, '') %>
 <% end %>
 
-Spec::Runner.autorun
+OpalTest::Runner.autorun

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

@@ -0,0 +1,120 @@
+module OpalTest
+  class TestCase
+
+    def self.test_cases
+      @test_cases ||= []
+    end
+
+    def self.inherited(klass)
+      TestCase.test_cases << klass
+      klass.instance_eval { @setup_hooks = []; @teardown_hooks = [] }
+    end
+
+    def self.description
+      to_s
+    end
+
+    def self.run(runner)
+      @runner = runner
+      @runner.example_group_started self
+
+      @running_examples = self.instance_methods.grep(/^test_/)
+      run_next_example
+    end
+
+    def self.run_next_example
+      if @running_examples.empty?
+        @runner.example_group_finished self
+      else
+        self.new(@running_examples.shift).run(@runner)
+      end
+    end
+
+    def self.example_started(example)
+      @runner.example_started(example)
+    end
+
+    def self.example_passed(example)
+      @runner.example_passed(example)
+      run_next_example
+    end
+
+    def self.example_failed(example)
+      @runner.example_failed(example)
+      run_next_example
+    end
+
+    def self.setup_hooks
+      @parent ? [].concat(@parent.setup_hooks).concat(@setup_hooks) : @setup_hooks
+    end
+
+    def self.teardown_hooks
+      @parent ? [].concat(@parent.teardown_hooks).concat(@teardown_hooks) : @teardown_hooks
+    end
+
+    def initialize(name)
+      @__name__ = name
+      @example_group = self.class
+      @description = name.sub(/^test_(\d)+_/, '')
+    end
+
+    def description
+      @__name__
+    end
+
+    attr_reader :example_group, :exception
+
+    def finish_running
+      if @exception
+        @example_group.example_failed self
+      else
+        @example_group.example_passed self
+      end
+    end
+
+    def run(runner)
+      @runner = runner
+      begin
+        @example_group.example_started self
+        run_before_hooks
+        setup
+        __send__ @__name__
+      rescue => e
+        @exception = e
+      ensure
+        unless @asynchronous
+          teardown
+          run_after_hooks
+        end
+      end
+
+      if @asynchronous
+        # must wait ...
+      else
+        finish_running
+      end
+    end
+
+    def run_after_hooks
+      begin
+        @example_group.teardown_hooks.each do |after|
+        instance_eval &after
+        end
+      rescue => e
+        @exception = e
+      end
+    end
+
+    def run_before_hooks
+      @example_group.setup_hooks.each do |before|
+        instance_eval &before
+      end
+    end
+
+    def setup
+    end
+
+    def teardown
+    end
+  end
+end

data/lib/opal/spec/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Spec
-    VERSION = '0.2.10'
+    VERSION = '0.2.11'
   end
 end

data/opal-spec.gemspec

@@ -12,4 +12,6 @@ Gem::Specification.new do |s|
 
   s.files          = `git ls-files`.split("\n")
   s.require_paths  = ['lib']
+
+  s.add_runtime_dependency 'opal', '~> 0.3.38'
 end

data/spec/specs.rb

@@ -1,21 +1,14 @@
-@passed = 0
-@failures = []
-
-def assert(value, message='Not true')
-  if value
-    @passed += 1
-  else
-    @failures << message
-  end
-end
+describe 'Normal group' do
+  it 'exceptions can be thrown' do
+    err = nil
 
-def assert_equal(got, expected, message='Not equal')
-  assert(got == expected, message)
-end
+    begin
+      1.should == 2
+    rescue => e
+      err = e
+    end
 
-describe 'Normal group' do
-  it 'this should fail' do
-    1.should == 2
+    raise "exception not thrown" unless err
   end
 end
 
@@ -26,7 +19,7 @@ describe "New eql" do
   end
 
   it "and this should fail" do
-    1.should eq(:adam)
+    lambda { 1.should eq(:adam) }.should raise_error(Exception)
   end
 end
 
@@ -41,10 +34,6 @@ describe 'Another group' do
     1.should == 1
   end
 
-  it 'this should fail' do
-    raise "whatever error you like"
-  end
-
   it 'this should pass' do
     true.should be_true
     false.should be_false
@@ -62,12 +51,41 @@ describe 'Another group' do
   async 'this should fail (in 0.1 second time)' do
     set_timeout(100) do
       run_async {
-        1.should == 5
+        lambda { 1.should == 5 }.should raise_error(Exception)
       }
     end
   end
 end
 
-Opal::Spec::Runner.autorun
+describe "let" do
+  $opal_spec_let_count = 0
+
+  let(:count) { $opal_spec_let_count = $opal_spec_let_count + 1 }
+
+  it "caches the method for the example" do
+    count.should eq(1)
+    count.should eq(1)
+  end
+
+  it "does not cache values between different examples" do
+    count.should eq(2)
+  end
+end
+
+describe "before" do
+  before do
+    @foo = 100
+  end
 
-puts "Assertions: #{@passed + @failures.length}, Passed: #{@passed}, Failures: #{@failures.length}"
+  before do
+    @bar = 200
+  end
+
+  it "should be run before each group" do
+    @foo.should == 100
+  end
+
+  it "should run multiple before blocks" do
+    @bar.should == 200
+  end
+end

data/spec/tests.rb

@@ -0,0 +1,9 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-spec
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
-dependencies: []
+date: 2013-02-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: opal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.38
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.38
 description: Opal compatible spec library
 email: adam.beynon@gmail.com
 executables: []
@@ -18,6 +34,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -25,15 +42,15 @@ files:
 - 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/assets/javascripts/opal/spec/spec.rb
 - lib/assets/javascripts/opal/spec/sprockets_runner.rb.erb
+- lib/assets/javascripts/opal/spec/test_case.rb
 - lib/opal-spec.rb
 - lib/opal/spec.rb
 - lib/opal/spec/rake_task.rb
@@ -41,6 +58,7 @@ files:
 - lib/opal/spec/version.rb
 - opal-spec.gemspec
 - spec/specs.rb
+- spec/tests.rb
 - vendor/spec_runner.html.erb
 - vendor/spec_runner.js
 homepage: http://opalrb.org

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

@@ -1,76 +0,0 @@
-module Spec
-  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/assets/javascripts/opal/spec/example_group.rb

@@ -1,92 +0,0 @@
-module Spec
-  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