Skip to content

Commit 081a405

Browse files
committed
test for sass 3.3 gemfiles should now work on travis i hope!
1 parent 9eff843 commit 081a405

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

Rakefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ task :test do
1010
Rake::Task["test_cleanup"].invoke if ok
1111
end
1212
end
13-
13+
desc "run cli sass 3.3 tests"
14+
task "sass_3_3_test" do
15+
sh "cd cli && (BUNDLE_GEMFILE=gemfiles/sass_3_3.gemfile bundle install --quiet && bundle exec rake test) && cd .." do |ok, res|
16+
Rake::Task["test_cleanup"].invoke if ok
17+
end
18+
end
1419

1520
desc "Clean up all test files"
1621
task :test_cleanup do

cli/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ unless ENV['PKG']
88
gem "compass-core", :path => "../core" unless defined?(CI)
99
gem "compass-import-once", :path => "../import-once" unless defined?(CI)
1010
gem 'sass-globbing', "~> 1.1.1"
11-
gem "compass-sprites", :path => "../sprites"
11+
gem "compass-sprites", :path => "../sprites" unless defined?(CI)
1212
gem "cucumber", "~> 1.2.1"
1313
gem "rspec", "~> 2.0.0"
1414
gem "compass-validator", "3.0.1"

cli/gemfiles/sass_3_3.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ gem 'sass', "~> 3.3.12"
66
gem 'compass', :path => "../"
77
gem 'compass-core', :path => "../../core"
88
gem 'compass-import-once', :path => "../../import-once"
9+
gem "compass-sprites", :path => "../../sprites"
910

1011
gemspec :path=>"../"

sprites/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ GEM
3232
specs:
3333
chunky_png (1.3.1)
3434
diff-lcs (1.2.5)
35-
ffi (1.9.4)
35+
ffi (1.9.5)
3636
metaclass (0.0.4)
3737
mocha (0.14.0)
3838
metaclass (~> 0.0.1)

test_all.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
cd core && bundle install --quiet && bundle exec rake test && cd .. &&
44
cd cli && bundle install --quiet && bundle exec rake && cd .. &&
5+
cd cli && (BUNDLE_GEMFILE=gemfiles/sass_3_3.gemfile bundle install --quiet && bundle exec rake test) && cd ..
56
cd import-once && bundle install --quiet && bundle exec rake test && cd .. &&
67
cd import-once && (BUNDLE_GEMFILE=Gemfile_sass_3_2 bundle install --quiet && bundle exec rake test) && cd ..
78
cd cli && bundle install --quiet && bundle exec rake && cd .. &&

0 commit comments

Comments
 (0)