Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opal/opal-rails
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cc832d860b4e
Choose a base ref
...
head repository: opal/opal-rails
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6fe59680fdd6
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 15, 2013

  1. Use opal-rspec prerelease

    elia committed Dec 15, 2013
    Copy the full SHA
    3a66997 View commit details
  2. Fix the assigns spec

    elia committed Dec 15, 2013
    Copy the full SHA
    6fe5968 View commit details
Showing with 6 additions and 2 deletions.
  1. +0 −1 Gemfile
  2. +1 −1 opal-rails.gemspec
  3. +5 −0 spec/integration/assigns_spec.rb
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ gemspec
gem 'capybara-webkit' unless ENV['CI']
gem 'opal', :github => 'opal/opal'
gem 'opal-jquery', :github => 'opal/opal-jquery'
gem 'opal-rspec', :github => 'opal/opal-rspec'

# gem 'opal', :path => '~/Code/opal'
# gem 'opal-jquery', :path => '~/Code/opal-jquery'
2 changes: 1 addition & 1 deletion opal-rails.gemspec
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
s.add_dependency 'rails', '>= 3.2.13', '< 5.0'
s.add_dependency 'opal', '~> 0.6.0'
s.add_dependency 'opal-jquery', '>= 0.1.0'
s.add_dependency 'opal-rspec'
s.add_dependency 'opal-rspec', '~> 0.3.0.beta1'
s.add_dependency 'jquery-rails'
s.add_dependency 'opal-activesupport', '>= 0.0.5'

5 changes: 5 additions & 0 deletions spec/integration/assigns_spec.rb
Original file line number Diff line number Diff line change
@@ -27,6 +27,11 @@ def get_source_of path

def opal_eval source
opal_source = get_source_of '/assets/opal.js'

# Any lib should be already required in the page,
# require won't work in this kind of templates.
opal_source << get_source_of('/assets/native.js')

context = ExecJS.compile opal_source
context.eval source
rescue