diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-03-26 11:53:51 +0400 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-03-26 11:53:51 +0400 |
commit | c004c7d77fb0b3ed8163ded20ec1ef31875524dc (patch) | |
tree | fbb6564979b03a270f8dac8c835b4aec5e970916 /test | |
parent | 4ce05c9903faa4414c5b7107e03fb9d36b0d34c7 (diff) |
Clean up dependencies
* Do not depend on sass-rails gem for testing
* Remove unused dummy rails app dep-s
Diffstat (limited to 'test')
-rw-r--r-- | test/dummy/config/application.rb | 9 | ||||
-rw-r--r-- | test/dummy/log/development.log | 0 | ||||
-rw-r--r-- | test/gemfiles/sass_3_3.gemfile | 3 | ||||
-rw-r--r-- | test/gemfiles/sass_head.gemfile | 1 |
4 files changed, 4 insertions, 9 deletions
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index 966cb2f..c064a97 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -1,13 +1,10 @@ require File.expand_path('../boot', __FILE__) -require 'rails' - +require 'rails/all' Bundler.require(*Rails.groups) - -require 'sass-rails' -require 'jquery-rails' -require 'slim-rails' require 'bootstrap-sass' +require 'slim-rails' +require 'jquery-rails' module Dummy class Application < Rails::Application diff --git a/test/dummy/log/development.log b/test/dummy/log/development.log deleted file mode 100644 index e69de29..0000000 --- a/test/dummy/log/development.log +++ /dev/null diff --git a/test/gemfiles/sass_3_3.gemfile b/test/gemfiles/sass_3_3.gemfile index 7987e75..4cd634b 100644 --- a/test/gemfiles/sass_3_3.gemfile +++ b/test/gemfiles/sass_3_3.gemfile @@ -1,8 +1,7 @@ source "https://rubygems.org" -gem 'sass', '~> 3.3.2' +gem 'sass', '~> 3.3.4' gem 'compass', '~> 1.0.0.alpha.19' -gem 'sass-rails', '~> 4.0.2' platform :rbx do gem 'rubysl', '~> 2.0' diff --git a/test/gemfiles/sass_head.gemfile b/test/gemfiles/sass_head.gemfile index 132c907..4b3f235 100644 --- a/test/gemfiles/sass_head.gemfile +++ b/test/gemfiles/sass_head.gemfile @@ -2,7 +2,6 @@ source "https://rubygems.org" gem 'sass', git: 'https://github.com/nex3/sass' gem 'compass', git: 'https://github.com/chriseppstein/compass', branch: 'master' -gem 'sass-rails', '~> 4.0.2' platform :rbx do gem 'rubysl', '~> 2.0' |