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: db0a1b981af4
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: 9e07509ff591
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 31, 2015

  1. Fix the opal_spec precompile matcher

    @elia
    elia committed Mar 31, 2015

    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
    ee17b94 View commit details

  2. Skip asset checks for opal_spec controller

    @elia
    elia committed Mar 31, 2015

    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
    9e07509 View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −0 app/controllers/opal_spec_controller.rb
  2. +0 −2 lib/opal/rails/engine.rb
7 changes: 7 additions & 0 deletions app/controllers/opal_spec_controller.rb
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@

class OpalSpecController < ActionController::Base
helper_method :spec_files, :pattern, :clean_spec_path, :runner_name
helper_method :check_errors_for

def run
logical_path = builder.runner_logical_path+'.js'
@@ -18,6 +19,12 @@ def run

private

# This will deactivate the requirement to precompile assets in this controller
# as specs shouldn't go to production anyway.
def check_errors_for(*)
#noop
end

def pattern
params[:pattern]
end
2 changes: 0 additions & 2 deletions lib/opal/rails/engine.rb
View file
Original file line number Diff line number Diff line change
@@ -31,8 +31,6 @@ class Engine < ::Rails::Engine
Opal.paths.each do |path|
app.assets.append_path path
end

app.config.assets.precompile << "#{runner_dir}/*.js"
end

config.after_initialize do |app|