Add simple #expect method to example groups

adambeynon · adambeynon · commit a190d22d83e1 · 2014-10-15T21:44:59.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
 gemspec
+
+gem 'opal', :github => 'opal/opal'
diff --git a/lib/opal/spec/rake_task.rb b/lib/opal/spec/rake_task.rb
@@ -1,5 +1,4 @@
 require 'opal/spec'
-require 'opal-sprockets'
 
 module Opal
   module Spec
diff --git a/opal-spec.gemspec b/opal-spec.gemspec
@@ -13,8 +13,7 @@ Gem::Specification.new do |s|
   s.files          = `git ls-files`.split("\n")
   s.require_paths  = ['lib']
 
-  s.add_dependency 'opal', '~> 0.5.0'
-  s.add_dependency 'opal-sprockets', '~> 0.3.0'
+  s.add_dependency 'opal', '~> 0.7.0.beta1'
 
   s.add_development_dependency 'rake'
 end
diff --git a/opal/opal/spec/phantom_formatter.rb b/opal/opal/spec/phantom_formatter.rb
@@ -6,11 +6,11 @@ def initialize
     end
 
     def log_green(str)
-      `console.log('\\033[32m' + str + '\\033[0m')`
+      `console.log('\033[32m' + str + '\033[0m')`
     end
 
     def log_red(str)
-      `console.log('\\033[31m' + str + '\\033[0m')`
+      `console.log('\033[31m' + str + '\033[0m')`
     end
 
     def log(str)
diff --git a/opal/opal/spec/runner.rb b/opal/opal/spec/runner.rb
@@ -1,7 +1,6 @@
 module OpalSpec
   class Runner
     def self.in_browser?
-      $global[:document]
       `typeof(document) !== 'undefined'`
     end
 
diff --git a/opal/opal/spec/spec.rb b/opal/opal/spec/spec.rb
@@ -181,5 +181,23 @@ def set_timeout(duration, &block)
       `setTimeout(#{block}, #{duration})`
       self
     end
+
+    def expect(value)
+      ExpectTarget.new(value)
+    end
+  end
+
+  class ExpectTarget
+    def initialize(value)
+      @value = value
+    end
+
+    def to(*args)
+      @value.should(*args)
+    end
+
+    def to_not(*args)
+      @value.should_not(*args)
+    end
   end
 end
diff --git a/opal/opal/spec/sprockets_runner.rb.erb b/opal/opal/spec/sprockets_runner.rb.erb
@@ -1,11 +1,11 @@
 # 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' %>
+require 'opal'
+require 'opal-spec'
 
 <% Dir.glob('spec/**/*_spec.{rb,opal}').each do |s| %>
-<% require_asset s.sub(/^spec\//, '').sub(/\.(rb|opal)$/, '') %>
+require <%= s.sub(/^spec\//, '').sub(/\.(rb|opal)$/, '').inspect %>
 <% end %>
 
 OpalSpec::Runner.autorun
diff --git a/spec/expect_spec.rb b/spec/expect_spec.rb
@@ -0,0 +1,9 @@
+describe '#expect' do
+  it 'works with simple matchers' do
+    expect(1).to eq(1)
+  end
+
+  it 'works with simple to_not matchers' do
+    expect(1).to_not eq(2)
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`require 'opal/spec'`
`2`		`-require 'opal-sprockets'`
`3`	`2`
`4`	`3`	`module Opal`
`5`	`4`	`module Spec`