mirror of
https://github.com/thoughtbot/factory_bot_rails.git
synced 2022-11-09 11:49:18 -05:00
Newer versions of activerecord-jdbcsqlite3-adapter work without a specially named db driver in database.yml
This commit is contained in:
parent
f68f1c234d
commit
a179d7f366
11 changed files with 9 additions and 19 deletions
|
@ -1,7 +1,7 @@
|
|||
appraise "rails3.0" do
|
||||
gem "rails", "3.0.18"
|
||||
gem "sqlite3", ">= 1.3.4", platforms: :mri
|
||||
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
|
||||
gem "minitest-rails"
|
||||
gem "therubyrhino"
|
||||
gem "jquery-rails"
|
||||
|
@ -15,7 +15,7 @@ appraise "rails3.1" do
|
|||
gem "uglifier"
|
||||
gem "turn"
|
||||
gem "sqlite3", ">= 1.3.4", platforms: :mri
|
||||
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
|
||||
gem "minitest-rails"
|
||||
gem "therubyrhino"
|
||||
gem "jquery-rails"
|
||||
|
@ -28,7 +28,7 @@ appraise "rails3.2" do
|
|||
gem "coffee-rails"
|
||||
gem "uglifier"
|
||||
gem "sqlite3", ">= 1.3.4", platforms: :mri
|
||||
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
|
||||
gem "minitest-rails"
|
||||
gem "therubyrhino"
|
||||
gem "jquery-rails"
|
||||
|
|
|
@ -6,7 +6,6 @@ Feature:
|
|||
Given I successfully run `bundle exec rails new testapp`
|
||||
And I cd to "testapp"
|
||||
And I add "factory_girl_rails" from this project as a dependency
|
||||
And I configure the database connection for the application
|
||||
|
||||
Scenario: Using Factory Girl and Factory Girl Rails with Test Unit generates a factory file and does not generate a fixture file
|
||||
And I run `bundle install` with a clean environment
|
||||
|
|
|
@ -7,7 +7,6 @@ Feature:
|
|||
Given I successfully run `bundle exec rails new testapp`
|
||||
And I cd to "testapp"
|
||||
And I add "factory_girl_rails" from this project as a dependency
|
||||
And I configure the database connection for the application
|
||||
|
||||
Scenario: The factory_girl_rails generators create a factory file for each model that I generate
|
||||
When I run `bundle install` with a clean environment
|
||||
|
|
|
@ -4,7 +4,6 @@ Feature: automatically load step definitions
|
|||
When I successfully run `bundle exec rails new testapp`
|
||||
And I cd to "testapp"
|
||||
And I add "factory_girl_rails" from this project as a dependency
|
||||
And I configure the database connection for the application
|
||||
And I comment out gem "turn" from my Gemfile
|
||||
And I run `bundle install` with a clean environment
|
||||
And I write to "db/migrate/1_create_users.rb" with:
|
||||
|
|
|
@ -42,13 +42,6 @@ end
|
|||
END
|
||||
end
|
||||
|
||||
When /^I configure the database connection for the application$/ do
|
||||
if RUBY_PLATFORM =~ /java/
|
||||
contents = File.read File.join(File.dirname(__FILE__), '..', '..', 'tmp', 'aruba', 'testapp', 'config', 'database.yml')
|
||||
overwrite_file 'config/database.yml', contents.gsub('adapter: sqlite3', 'adapter: jdbcsqlite3')
|
||||
end
|
||||
end
|
||||
|
||||
When /^I comment out gem "([^"]*)" from my Gemfile$/ do |gem_name|
|
||||
in_current_dir do
|
||||
content = File.read('Gemfile')
|
||||
|
|
|
@ -4,7 +4,7 @@ source "http://rubygems.org"
|
|||
|
||||
gem "rails", "3.0.18"
|
||||
gem "sqlite3", ">= 1.3.4", :platforms=>:mri
|
||||
gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
|
||||
gem "minitest-rails"
|
||||
gem "therubyrhino"
|
||||
gem "jquery-rails"
|
||||
|
|
|
@ -124,7 +124,7 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
activerecord-jdbcsqlite3-adapter
|
||||
activerecord-jdbcsqlite3-adapter (~> 1.2.5)
|
||||
appraisal (~> 0.5.0)
|
||||
aruba (~> 0.5.1)
|
||||
cucumber (~> 1.2.1)
|
||||
|
|
|
@ -8,7 +8,7 @@ gem "coffee-rails"
|
|||
gem "uglifier"
|
||||
gem "turn"
|
||||
gem "sqlite3", ">= 1.3.4", :platforms=>:mri
|
||||
gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
|
||||
gem "minitest-rails"
|
||||
gem "therubyrhino"
|
||||
gem "jquery-rails"
|
||||
|
|
|
@ -156,7 +156,7 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
activerecord-jdbcsqlite3-adapter
|
||||
activerecord-jdbcsqlite3-adapter (~> 1.2.5)
|
||||
appraisal (~> 0.5.0)
|
||||
aruba (~> 0.5.1)
|
||||
coffee-rails
|
||||
|
|
|
@ -7,7 +7,7 @@ gem "sass-rails"
|
|||
gem "coffee-rails"
|
||||
gem "uglifier"
|
||||
gem "sqlite3", ">= 1.3.4", :platforms=>:mri
|
||||
gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
|
||||
gem "minitest-rails"
|
||||
gem "therubyrhino"
|
||||
gem "jquery-rails"
|
||||
|
|
|
@ -151,7 +151,7 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
activerecord-jdbcsqlite3-adapter
|
||||
activerecord-jdbcsqlite3-adapter (~> 1.2.5)
|
||||
appraisal (~> 0.5.0)
|
||||
aruba (~> 0.5.1)
|
||||
coffee-rails
|
||||
|
|
Loading…
Reference in a new issue