diff --git a/.rubocop.yml b/.rubocop.yml index c0dff4f28a..988f375927 100644 --- a/.rubocop.yml +++ b/.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 diff --git a/Gemfile b/Gemfile index c9adaeabdb..bd7b44dfac 100644 --- a/Gemfile +++ b/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' diff --git a/lib/alchemy/sass_support.rb b/lib/alchemy/sass_support.rb deleted file mode 100644 index 65abc73d70..0000000000 --- a/lib/alchemy/sass_support.rb +++ /dev/null @@ -1,9 +0,0 @@ -begin - require 'sassc-rails' -rescue LoadError, Gem::LoadError - begin - require 'sass-rails' - rescue LoadError, Gem::LoadError - raise LoadError, "Could not find the `sass-rails` or `sassc-rails` gem for AlchemyCMS! Please add one of them to your project's Gemfile." - end -end diff --git a/lib/alchemy_cms.rb b/lib/alchemy_cms.rb index b392aaacca..dfa6fca647 100644 --- a/lib/alchemy_cms.rb +++ b/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' diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 7a771fd670..012a9fa614 100644 --- a/spec/rails_helper.rb +++ b/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 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d90f0820be..2980961b8a 100644 --- a/spec/spec_helper.rb +++ b/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"