Merge pull request #1731 from AlchemyCMS/sprockets-4-concurrent-fix

Run CI builds with Sprockets 3.7.2

.rubocop.yml

@@ -119,10 +119,6 @@ Lint/HandleExceptions:
   Exclude:
     - 'config/initializers/mini_profiler.rb'
 
-Lint/ShadowedException:
-  Exclude:
-    - 'lib/alchemy/sass_support.rb'
-
 Style/CollectionMethods:
   Enabled: false
 

Gemfile

@@ -12,7 +12,9 @@ gem 'mysql2', '~> 0.5.1' if ENV['DB'] == 'mysql'
 gem 'pg',     '~> 1.0'   if ENV['DB'] == 'postgresql'
 
 group :development, :test do
-  unless ENV['CI']
+  if ENV['CI']
+    gem 'sprockets', '< 4.0' # Sprockets 4 has serious issues with libsass on Linux machines
+  else
     gem 'launchy'
     gem 'annotate'
     gem 'bumpy'

lib/alchemy_cms.rb

@@ -19,6 +19,7 @@ module Alchemy
 require 'ransack'
 require 'request_store'
 require 'responders'
+require 'sassc-rails'
 require 'simple_form'
 require 'select2-rails'
 require 'turbolinks'
@@ -48,7 +49,6 @@ module Alchemy
 require_relative 'alchemy/page_layout'
 require_relative 'alchemy/paths'
 require_relative 'alchemy/permissions'
-require_relative 'alchemy/sass_support'
 require_relative 'alchemy/ssl_protection'
 require_relative 'alchemy/resource'
 require_relative 'alchemy/tinymce'

spec/rails_helper.rb

@@ -93,7 +93,6 @@
       # towards the timing of the first feature spec.
       start = Time.now
       puts "Preloading assets."
-      Rails.application.assets.cache.clear
       Rails.application.precompiled_assets
       puts "Done in #{(Time.now - start).round(2)}s"
     end

spec/spec_helper.rb

@@ -5,7 +5,6 @@
   require 'codeclimate-test-reporter'
 end
 SimpleCov.start 'rails' do
-  add_filter "/lib/alchemy/sass_support"
   add_filter "/lib/alchemy/upgrader"
   add_filter "/lib/alchemy/version"
   add_filter "/lib/rails"