diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-06-24 04:57:06 +0400 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-06-24 05:08:13 +0400 |
commit | 0cbe7255b5ef45ba79ab684b61bf2d2443876e84 (patch) | |
tree | c3dad44326f643add3547d94353f73da0b2d05eb /test | |
parent | 380194abaf1721915e763dfc4a1ca29ebf3eaaa7 (diff) |
pure scss asset helpers, new paths
Diffstat (limited to 'test')
-rw-r--r-- | test/compilation_test.rb | 2 | ||||
-rw-r--r-- | test/dummy_node_mincer/manifest.js | 4 | ||||
-rw-r--r-- | test/dummy_rails/app/assets/stylesheets/application.css.sass | 3 | ||||
-rw-r--r-- | test/node_sass_test.rb | 2 | ||||
-rw-r--r-- | test/test_helper.rb | 1 |
5 files changed, 6 insertions, 6 deletions
diff --git a/test/compilation_test.rb b/test/compilation_test.rb index f073eed..86c5d4d 100644 --- a/test/compilation_test.rb +++ b/test/compilation_test.rb @@ -3,7 +3,7 @@ require 'fileutils' class CompilationTest < Test::Unit::TestCase def test_compilation - path = 'vendor/assets/stylesheets' + path = 'assets/stylesheets' %w(bootstrap bootstrap/_theme).each do |file| engine = Sass::Engine.for_file("#{path}/#{file}.scss", syntax: :scss, load_paths: [path]) assert_nothing_raised do diff --git a/test/dummy_node_mincer/manifest.js b/test/dummy_node_mincer/manifest.js index a4d22dd..7935b97 100644 --- a/test/dummy_node_mincer/manifest.js +++ b/test/dummy_node_mincer/manifest.js @@ -39,10 +39,10 @@ var environment = new Mincer.Environment(process.cwd()); // Include bootstrap scss load path var bootstrapPath = '../../'; -environment.appendPath(bootstrapPath + 'vendor/assets/stylesheets'); +environment.appendPath(bootstrapPath + 'assets/stylesheets'); // Include fonts load path -environment.appendPath(bootstrapPath + 'vendor/assets/fonts'); +environment.appendPath(bootstrapPath + 'assets/fonts'); // Include dir with assets, root just for test environment.appendPath('./'); diff --git a/test/dummy_rails/app/assets/stylesheets/application.css.sass b/test/dummy_rails/app/assets/stylesheets/application.css.sass index 7697a21..838dc90 100644 --- a/test/dummy_rails/app/assets/stylesheets/application.css.sass +++ b/test/dummy_rails/app/assets/stylesheets/application.css.sass @@ -1 +1,2 @@ -@import "bootstrap"
\ No newline at end of file +@import 'bootstrap-sprockets' +@import 'bootstrap' diff --git a/test/node_sass_test.rb b/test/node_sass_test.rb index 45f75df..0010009 100644 --- a/test/node_sass_test.rb +++ b/test/node_sass_test.rb @@ -3,7 +3,7 @@ require 'fileutils' class NodeSassTest < Test::Unit::TestCase def test_node_sass_compilation - path = 'vendor/assets/stylesheets' + path = 'assets/stylesheets' %w(bootstrap bootstrap/_theme).each do |file| FileUtils.mkdir_p "tmp/node-sass" command = "node-sass #{path}/#{file} -o tmp/node-sass/#{File.basename file}.css" diff --git a/test/test_helper.rb b/test/test_helper.rb index a8cf3bf..5a15709 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -6,7 +6,6 @@ require File.expand_path('dummy_rails/config/environment', File.dirname(__FILE__ require 'test/unit' require 'sass' -require 'lib/bootstrap-sass/sass_functions' require 'rails/test_help' |