update test gemfiles, fix tests for compass 1.0.0

4 files changed, 18 insertions, 4 deletions

diff --git a/test/compass_test.rb b/test/compass_test.rb
index 00d76610..b700fed1 100644
--- a/test/compass_test.rb
+++ b/test/compass_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
 
 class CompassTest < Test::Unit::TestCase
   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']
                 system command
               else
diff --git a/test/gemfiles/sass_3_3.gemfile b/test/gemfiles/sass_3_3.gemfile
index 94362673..69aab7df 100644
--- a/test/gemfiles/sass_3_3.gemfile
+++ b/test/gemfiles/sass_3_3.gemfile
@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
-gem 'sass', '~> 3.3.6'
-gem 'compass', '~> 1.0.0.alpha.19'
+gem 'sass', '~> 3.3.14'
+gem 'compass', '~> 1.0.0'
+gem 'compass-import-once', '~> 1.0.5'
 
 gemspec path: '../../'
diff --git a/test/gemfiles/sass_3_4.gemfile b/test/gemfiles/sass_3_4.gemfile
new file mode 100644
index 00000000..c0a1d511
--- /dev/null
+++ b/test/gemfiles/sass_3_4.gemfile
@@ -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: '../../'
+
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 034d503b..575b7071 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -7,9 +7,14 @@ require 'test-unit'
 
 require 'sass'
 
+require 'compass'
+require 'compass-import-once' if defined?(Compass::Core)
+
 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
 require 'capybara/rails'