Merge pull request #178 from pablobm/rails-4.1

Rails 4.1. See rails/sprockets-rails#84
jfirebaugh · May 24, 2014 · 5e80044 · 5e80044
2 parents 8d1f616 + cda0338
commit 5e80044
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ rvm:
 gemfile:
   - Gemfile
   - Gemfile-rails3
+  - Gemfile-rails40
 before_script:
   - sh -e /etc/init.d/xvfb start
   - export DISPLAY=:99.0
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 gemspec
 
+gem "railties", "~> 4.1.0"
 gem "sprockets-rails"
 gem "activemodel" # https://github.com/rspec/rspec-rails/pull/798
diff --git a/Gemfile-rails40 b/Gemfile-rails40
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec
+
+gem "railties", "~> 4.0.0"
+gem "sprockets-rails"
+gem "activemodel" # https://github.com/rspec/rspec-rails/pull/798
diff --git a/lib/konacha/engine.rb b/lib/konacha/engine.rb
@@ -45,6 +45,7 @@ def self.formatters
       options.formatters   ||= self.class.formatters
 
       app.config.assets.paths << app.root.join(options.spec_dir).to_s
+      app.config.assets.precompile << lambda{|path| path =~ %r{\.(js|coffee)$} }
     end
   end
 end
diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb
@@ -24,4 +24,9 @@
 
   # Expands the lines which load the assets
   config.assets.debug = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
 end