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: 436181c1bca3
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: 1cc05cef1143
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 7, 2014

  1. ‘.js’ extension is not needed anymore 

    It actually breaks stuff.
    @elia
    elia committed Oct 7, 2014

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    64fe65b View commit details

  2. Browser specs are green again

    @elia
    elia committed Oct 7, 2014

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b6ad48a View commit details

  3. Make easy to pick opal-jquery from local checkout

    @elia
    elia committed Oct 7, 2014

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    1cc05ce View commit details
Showing with 4 additions and 6 deletions.
  1. +1 −0 Gemfile
  2. +1 −2 lib/assets/javascripts/opal-rspec-runner.js.rb
  3. +2 −2 lib/assets/javascripts/opal_ujs.js.rb
  4. +0 −2 spec/integration/in_browser_specs_spec.rb
1 change: 1 addition & 0 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ gemspec
gem 'capybara-webkit'
gem 'opal-jquery', github: 'opal/opal-jquery'
gem 'opal', github: 'opal'
# gem 'opal-jquery', path: '../opal-jquery'
# gem 'opal', path: '../opal'

if RUBY_VERSION.to_f < 1.9
3 changes: 1 addition & 2 deletions lib/assets/javascripts/opal-rspec-runner.js.rb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require 'jquery.js'

require 'opal'
require 'jquery'
require 'opal-rspec'
require 'opal-jquery'

4 changes: 2 additions & 2 deletions lib/assets/javascripts/opal_ujs.js.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'jquery.js'
require 'jquery_ujs.js'
require 'jquery'
require 'jquery_ujs'
require 'opal'
require 'opal-jquery'
2 changes: 0 additions & 2 deletions spec/integration/in_browser_specs_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
require 'spec_helper'

feature 'In-browser specs runner' do
before { skip 'STILL NEED TO FIX FOR OPAL-RSPEC' }

scenario 'runs all specs', :js do
visit '/opal_spec'