Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-sass.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2014-03-26 11:53:51 +0400
committerGleb Mazovetskiy <glex.spb@gmail.com>2014-03-26 11:53:51 +0400
commitc004c7d77fb0b3ed8163ded20ec1ef31875524dc (patch)
treefbb6564979b03a270f8dac8c835b4aec5e970916 /test
parent4ce05c9903faa4414c5b7107e03fb9d36b0d34c7 (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.rb9
-rw-r--r--test/dummy/log/development.log0
-rw-r--r--test/gemfiles/sass_3_3.gemfile3
-rw-r--r--test/gemfiles/sass_head.gemfile1
4 files changed, 4 insertions, 9 deletions
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
index 966cb2ff..c064a978 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 e69de29b..00000000
--- 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 7987e759..4cd634bc 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 132c9079..4b3f2358 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'