Update opal, switch to opal-rspec

opal · Nov 5, 2013 · 98ec90e · 98ec90e
1 parent 44d6e0a
commit 98ec90e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'opal', '~> 0.5.0'
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,7 @@
 require 'bundler'
 Bundler.require
 
-require 'opal/spec/rake_task'
-Opal::Spec::RakeTask.new(:default)
+require 'opal/rspec/rake_task'
+Opal::RSpec::RakeTask.new(:default)
 
 require 'bundler/gem_tasks'
diff --git a/opal-activesupport.gemspec b/opal-activesupport.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'opal', '~> 0.4.2'
+  gem.add_dependency 'opal'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'opal-spec', '~> 0.2.17'
+  gem.add_development_dependency 'opal-rspec'
 end
diff --git a/opal/active_support/core_ext/string.rb b/opal/active_support/core_ext/string.rb
@@ -26,6 +26,7 @@ def underscore
     `#{self}.replace(/[-\\s]+/g, '_')
     .replace(/([A-Z\\d]+)([A-Z][a-z])/g, '$1_$2')
     .replace(/([a-z\\d])([A-Z])/g, '$1_$2')
+    .replace(/-/g, '_')
     .toLowerCase()`
   end
 

diff --git a/opal/opal-activesupport.rb b/opal/opal-activesupport.rb
@@ -1 +1 @@
-require 'opal/activesupport'
+require 'active_support'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,5 +1,13 @@
-require 'opal-spec'
+require 'opal-rspec'
+require 'opal-activesupport'
 
-def assert_equal actual, expected
-  actual.should == expected
+module TestUnitHelpers
+  def assert_equal actual, expected
+    actual.should == expected
+  end
 end
+
+RSpec.configure do |config|
+  config.include TestUnitHelpers
+end
+