mirror of
https://github.com/twbs/bootstrap-sass.git
synced 2022-11-09 12:27:02 -05:00
update test gemfiles, fix tests for compass 1.0.0
This commit is contained in:
parent
67763549c1
commit
3b493908b8
6 changed files with 22 additions and 11 deletions
|
@ -1,12 +1,12 @@
|
||||||
language: ruby
|
language: ruby
|
||||||
rvm:
|
rvm:
|
||||||
- 2.1.1
|
- 2.1.2
|
||||||
- 2.0.0
|
|
||||||
- jruby
|
- jruby
|
||||||
- rbx-2
|
- rbx-2
|
||||||
gemfile:
|
gemfile:
|
||||||
- test/gemfiles/sass_3_2.gemfile
|
- test/gemfiles/sass_3_2.gemfile
|
||||||
- test/gemfiles/sass_3_3.gemfile
|
- test/gemfiles/sass_3_3.gemfile
|
||||||
|
- test/gemfiles/sass_3_4.gemfile
|
||||||
- test/gemfiles/sass_head.gemfile
|
- test/gemfiles/sass_head.gemfile
|
||||||
before_install:
|
before_install:
|
||||||
- "npm install node-sass mincer ejs"
|
- "npm install node-sass mincer ejs"
|
||||||
|
|
|
@ -3,11 +3,7 @@ module Bootstrap
|
||||||
# Inspired by Kaminari
|
# Inspired by Kaminari
|
||||||
def load!
|
def load!
|
||||||
register_compass_extension if compass?
|
register_compass_extension if compass?
|
||||||
|
register_rails_engine if rails?
|
||||||
if rails?
|
|
||||||
register_rails_engine
|
|
||||||
end
|
|
||||||
|
|
||||||
configure_sass
|
configure_sass
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -59,6 +55,7 @@ module Bootstrap
|
||||||
def register_compass_extension
|
def register_compass_extension
|
||||||
::Compass::Frameworks.register(
|
::Compass::Frameworks.register(
|
||||||
'bootstrap',
|
'bootstrap',
|
||||||
|
:version => Bootstrap::VERSION,
|
||||||
:path => gem_path,
|
:path => gem_path,
|
||||||
:stylesheets_directory => stylesheets_path,
|
:stylesheets_directory => stylesheets_path,
|
||||||
:templates_directory => File.join(gem_path, 'templates')
|
:templates_directory => File.join(gem_path, 'templates')
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'test_helper'
|
||||||
|
|
||||||
class CompassTest < Test::Unit::TestCase
|
class CompassTest < Test::Unit::TestCase
|
||||||
def test_create_project
|
def test_create_project
|
||||||
command = 'rm -rf tmp/new-compass-project; compass create tmp/new-compass-project -r bootstrap-sass --using bootstrap --trace --force'
|
command = 'rm -rf tmp/new-compass-project; bundle exec compass create tmp/new-compass-project -r bootstrap-sass --using bootstrap --trace --force'
|
||||||
success = if ENV['VERBOSE']
|
success = if ENV['VERBOSE']
|
||||||
system command
|
system command
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
source "https://rubygems.org"
|
source "https://rubygems.org"
|
||||||
|
|
||||||
gem 'sass', '~> 3.3.6'
|
gem 'sass', '~> 3.3.14'
|
||||||
gem 'compass', '~> 1.0.0.alpha.19'
|
gem 'compass', '~> 1.0.0'
|
||||||
|
gem 'compass-import-once', '~> 1.0.5'
|
||||||
|
|
||||||
gemspec path: '../../'
|
gemspec path: '../../'
|
||||||
|
|
8
test/gemfiles/sass_3_4.gemfile
Normal file
8
test/gemfiles/sass_3_4.gemfile
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
source "https://rubygems.org"
|
||||||
|
|
||||||
|
gem 'sass', '~> 3.4.0'
|
||||||
|
gem 'compass', '~> 1.0.0'
|
||||||
|
gem 'compass-import-once', '~> 1.0.5'
|
||||||
|
|
||||||
|
gemspec path: '../../'
|
||||||
|
|
|
@ -7,9 +7,14 @@ require 'test-unit'
|
||||||
|
|
||||||
require 'sass'
|
require 'sass'
|
||||||
|
|
||||||
|
require 'compass'
|
||||||
|
require 'compass-import-once' if defined?(Compass::Core)
|
||||||
|
|
||||||
require 'rails/test_help'
|
require 'rails/test_help'
|
||||||
|
|
||||||
Dir[File.expand_path("./support/**/*.rb", File.dirname(__FILE__))].each { |f| require f }
|
Dir[File.expand_path('./support/**/*.rb', File.dirname(__FILE__))].each do |file|
|
||||||
|
require file
|
||||||
|
end
|
||||||
|
|
||||||
#= Capybara + Poltergeist
|
#= Capybara + Poltergeist
|
||||||
require 'capybara/rails'
|
require 'capybara/rails'
|
||||||
|
|
Loading…
Add table
Reference in a new issue