Merge pull request #52 from rzane/fix-travis

Fix broken travis builds
rowland · Feb 13, 2015 · 1b18520 · 1b18520
2 parents 493d181 + 8cb39a5
commit 1b18520
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.0.0-p247
+  - 2.0
 
 before_install:
   - sudo apt-get install firebird2.5-superclassic firebird2.5-dev

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'bcrypt', '~> 3.1.7', require: false
+gem 'bcrypt', '~> 3.0', require: false
 
 if ENV['RAILS_SOURCE']
   gemspec path: ENV['RAILS_SOURCE']

diff --git a/test/cases/database_tasks_test_fb.rb b/test/cases/database_tasks_test_fb.rb
@@ -7,7 +7,7 @@
 # simply so that it can be referenced in the test
 class ActiveRecord::Tasks::DatabaseAlreadyExists < StandardError; end
 
-class DatabaseTasksTestFb < Minitest::Test
+class DatabaseTasksTestFb < ActiveSupport::TestCase
   def setup
     ar_config = YAML.load ERB.new(File.read(ENV['ARCONFIG'])).result
     @config = ar_config['fbunit_tasks']