Hello community,
here is the log from the commit of package rubygem-factory_girl_rails for
openSUSE:Factory checked in at 2015-02-16 21:12:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-factory_girl_rails (Old)
and /work/SRC/openSUSE:Factory/.rubygem-factory_girl_rails.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-factory_girl_rails"
Changes:
--------
---
/work/SRC/openSUSE:Factory/rubygem-factory_girl_rails/rubygem-factory_girl_rails.changes
2014-10-14 07:12:57.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.rubygem-factory_girl_rails.new/rubygem-factory_girl_rails.changes
2015-02-16 21:12:42.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Feb 10 17:42:58 UTC 2015 - co...@suse.com
+
+- updated to version 4.5.0
+
+-------------------------------------------------------------------
Old:
----
factory_girl_rails-4.4.1.gem
New:
----
factory_girl_rails-4.5.0.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-factory_girl_rails.spec ++++++
--- /var/tmp/diff_new_pack.s2fyzI/_old 2015-02-16 21:12:43.000000000 +0100
+++ /var/tmp/diff_new_pack.s2fyzI/_new 2015-02-16 21:12:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-factory_girl_rails
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,15 @@
#
+#
+# This file was generated with a gem2rpm.yml and not just plain gem2rpm.
+# All sections marked as MANUAL, license headers, summaries and descriptions
+# can be maintained in that file. Please consult this file before editing any
+# of those fields
+#
+
Name: rubygem-factory_girl_rails
-Version: 4.4.1
+Version: 4.5.0
Release: 0
%define mod_name factory_girl_rails
%define mod_full_name %{mod_name}-%{version}
@@ -25,12 +32,14 @@
BuildRequires: %{rubygem gem2rpm}
BuildRequires: %{ruby}
BuildRequires: ruby-macros >= 5
+BuildRequires: update-alternatives
Url: http://github.com/thoughtbot/factory_girl_rails
Source: http://rubygems.org/gems/%{mod_full_name}.gem
Source1: gem2rpm.yml
Summary: factory_girl_rails provides integration between factory_girl
and
License: MIT
Group: Development/Languages/Ruby
+PreReq: update-alternatives
%description
factory_girl_rails provides integration between
@@ -43,6 +52,7 @@
%install
%gem_install \
+ --symlink-binaries \
--doc-files="LICENSE README.md" \
-f
++++++ factory_girl_rails-4.4.1.gem -> factory_girl_rails-4.5.0.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore 2014-02-26 16:42:32.000000000 +0100
+++ new/.gitignore 2014-10-17 23:09:11.000000000 +0200
@@ -1,9 +1,9 @@
*.swp
-test.db
-factory_girl_rails-*.gem
-tmp
-rdoc
+.bundle
+gemfiles/*.lock
coverage
+factory_girl_rails-*.gem
pkg
-.bundle
-Gemfile.lock
+rdoc
+test.db
+tmp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.travis.yml new/.travis.yml
--- old/.travis.yml 2014-02-26 16:42:32.000000000 +0100
+++ new/.travis.yml 2014-10-17 23:09:11.000000000 +0200
@@ -1,16 +1,20 @@
+language: ruby
+cache: bundler
rvm:
- 1.9.3
- 2.0.0
+ - 2.1.2
- jruby-19mode
-before_install:
- - gem update --system
- - gem install turn --version 0.8.2
- - gem install turn --version 0.8.3
jdk:
- openjdk6
-gemfile:
- - gemfiles/rails3.1.gemfile
- - gemfiles/rails3.2.gemfile
branches:
only:
- master
+install:
+ - "travis_retry bundle install"
+ - "bundle exec appraisal generate"
+ - "travis_retry bundle exec appraisal install"
+gemfile:
+ - gemfiles/rails3.2.gemfile
+ - gemfiles/rails4.0.gemfile
+ - gemfiles/rails4.1.gemfile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Appraisals new/Appraisals
--- old/Appraisals 2014-02-26 16:42:32.000000000 +0100
+++ new/Appraisals 2014-10-17 23:09:11.000000000 +0200
@@ -1,25 +1,16 @@
-appraise "rails3.1" do
- gem "rails", "3.1.10"
- gem "sass-rails"
- gem "coffee-rails"
- gem "uglifier"
- gem "sqlite3", ">= 1.3.4", platforms: :mri
- gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
- gem "minitest-rails"
- gem "therubyrhino"
- gem "jquery-rails"
- gem "rspec-rails"
+# These are the versions of Rails we want to test against.
+appraise 'rails3.2' do
+ gem 'rails', '~> 3.2.18'
+ gem 'sass-rails'
end
-appraise "rails3.2" do
- gem "rails", "3.2.11"
- gem "sass-rails"
- gem "coffee-rails"
- gem "uglifier"
- gem "sqlite3", ">= 1.3.4", platforms: :mri
- gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
- gem "minitest-rails"
- gem "therubyrhino"
- gem "jquery-rails"
- gem "rspec-rails"
+appraise 'rails4.0' do
+ gem 'rails', '~> 4.0.5'
+ gem 'sass-rails'
+end
+
+appraise 'rails4.1' do
+ gem 'rails', '~> 4.1.1'
+ gem 'sass-rails', '~> 4.0.3'
+ gem 'spring'
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CONTRIBUTING.md new/CONTRIBUTING.md
--- old/CONTRIBUTING.md 2014-02-26 16:42:32.000000000 +0100
+++ new/CONTRIBUTING.md 2014-10-17 23:09:11.000000000 +0200
@@ -1,38 +1,36 @@
-We love pull requests. Here's a quick guide:
+# Contributing
-1. Fork the repo.
+We love pull requests. Here's a quick guide.
-2. Run the tests. We only take pull requests with passing tests, and it's great
-to know that you have a clean slate: `bundle && rake`
+Fork, then clone the repo:
-3. Add a test for your change. Only refactoring and documentation changes
-require no new tests. If you are adding functionality or fixing a bug, we need
-a test!
+ git clone g...@github.com:your-username/factory_girl_rails.git
-4. Make the test pass.
+Set up your machine:
-5. Push to your fork and submit a pull request.
+ ./bin/setup
+Make sure the tests pass:
-At this point you're waiting on us. We like to at least comment on, if not
-accept, pull requests within three business days (and, typically, one business
-day). We may suggest some changes or improvements or alternatives.
+ rake
-Some things that will increase the chance that your pull request is accepted,
-taken straight from the Ruby on Rails guide:
+Make your change. Add tests for your change. Make the tests pass:
-* Use Rails idioms and helpers
-* Include tests that fail without your code, and pass with it
-* Update the documentation, the surrounding one, examples elsewhere, guides,
- whatever is affected by your contribution
+ rake
-Syntax:
+Push to your fork and [submit a pull request][pr].
-* Two spaces, no tabs.
-* No trailing whitespace. Blank lines should not have any space.
-* Prefer &&/|| over and/or.
-* MyClass.my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-* a = b and not a=b.
-* Follow the conventions you see used in the source already.
+[pr]: https://github.com/thoughtbot/factory_girl_rails/compare/
-And in case we didn't emphasize it enough: we love tests!
+At this point you're waiting on us. We like to at least comment on pull
requests
+within three business days (and, typically, one business day). We may suggest
+some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted:
+
+* Write tests.
+* Follow our [style guide][style].
+* Write a [good commit message][commit].
+
+[style]: https://github.com/thoughtbot/guides/tree/master/style
+[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gemfile new/Gemfile
--- old/Gemfile 2014-02-26 16:42:32.000000000 +0100
+++ new/Gemfile 2014-10-17 23:09:11.000000000 +0200
@@ -1,3 +1,20 @@
-source "https://rubygems.org";
+source 'https://rubygems.org'
gemspec
+
+gem 'appraisal'
+gem 'aruba'
+gem 'coffee-rails'
+gem 'cucumber'
+gem 'jquery-rails'
+gem 'rake'
+gem 'rspec-rails'
+gem 'uglifier'
+
+if RUBY_PLATFORM == 'java'
+ gem 'activerecord-jdbcsqlite3-adapter'
+ gem 'jdbc-sqlite3'
+ gem 'therubyrhino'
+else
+ gem 'sqlite3'
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Gemfile.lock new/Gemfile.lock
--- old/Gemfile.lock 1970-01-01 01:00:00.000000000 +0100
+++ new/Gemfile.lock 2014-10-17 23:09:11.000000000 +0200
@@ -0,0 +1,112 @@
+PATH
+ remote: .
+ specs:
+ factory_girl_rails (4.5.0)
+ factory_girl (~> 4.5.0)
+ railties (>= 3.0.0)
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ actionpack (4.1.1)
+ actionview (= 4.1.1)
+ activesupport (= 4.1.1)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ actionview (4.1.1)
+ activesupport (= 4.1.1)
+ builder (~> 3.1)
+ erubis (~> 2.7.0)
+ activemodel (4.1.1)
+ activesupport (= 4.1.1)
+ builder (~> 3.1)
+ activesupport (4.1.1)
+ i18n (~> 0.6, >= 0.6.9)
+ json (~> 1.7, >= 1.7.7)
+ minitest (~> 5.1)
+ thread_safe (~> 0.1)
+ tzinfo (~> 1.1)
+ appraisal (1.0.0)
+ bundler
+ rake
+ thor (>= 0.14.0)
+ aruba (0.5.4)
+ childprocess (>= 0.3.6)
+ cucumber (>= 1.1.1)
+ rspec-expectations (>= 2.7.0)
+ builder (3.2.2)
+ childprocess (0.5.3)
+ ffi (~> 1.0, >= 1.0.11)
+ coffee-rails (4.0.1)
+ coffee-script (>= 2.2.0)
+ railties (>= 4.0.0, < 5.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.7.0)
+ cucumber (1.3.15)
+ builder (>= 2.1.2)
+ diff-lcs (>= 1.1.3)
+ gherkin (~> 2.12)
+ multi_json (>= 1.7.5, < 2.0)
+ multi_test (>= 0.1.1)
+ diff-lcs (1.2.5)
+ erubis (2.7.0)
+ execjs (2.0.2)
+ factory_girl (4.5.0)
+ activesupport (>= 3.0.0)
+ ffi (1.9.3)
+ gherkin (2.12.2)
+ multi_json (~> 1.3)
+ i18n (0.6.9)
+ jquery-rails (3.1.0)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.8.1)
+ minitest (5.3.4)
+ multi_json (1.10.1)
+ multi_test (0.1.1)
+ rack (1.5.2)
+ rack-test (0.6.2)
+ rack (>= 1.0)
+ railties (4.1.1)
+ actionpack (= 4.1.1)
+ activesupport (= 4.1.1)
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+ rake (10.3.2)
+ rspec-core (2.14.8)
+ rspec-expectations (2.14.5)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.14.6)
+ rspec-rails (2.14.2)
+ actionpack (>= 3.0)
+ activemodel (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
+ sqlite3 (1.3.9)
+ thor (0.19.1)
+ thread_safe (0.3.3)
+ tzinfo (1.2.0)
+ thread_safe (~> 0.1)
+ uglifier (2.5.0)
+ execjs (>= 0.3.0)
+ json (>= 1.8.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ appraisal
+ aruba
+ coffee-rails
+ cucumber
+ factory_girl_rails!
+ jquery-rails
+ rake
+ rspec-rails
+ sqlite3
+ uglifier
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2014-02-26 16:42:32.000000000 +0100
+++ new/README.md 2014-10-17 23:09:11.000000000 +0200
@@ -1,73 +1,74 @@
-factory_girl [](http://travis-ci.org/thoughtbot/factory_girl_rails?branch=master)
-============
+# factory_girl_rails [![Build Status][ci-image]][ci] [![Code
Climate][grade-image]][grade]
-`factory_girl` is a fixtures replacement with a straightforward definition
+[factory_girl][fg] is a fixtures replacement with a straightforward definition
syntax, support for multiple build strategies (saved instances, unsaved
instances, attribute hashes, and stubbed objects), and support for multiple
factories for the same class (`user`, `admin_user`, and so on), including
factory
inheritance.
-Rails
------
+## Rails
-`factory_girl_rails` provides Rails integration for `factory_girl`. All
-Rails-specific features are only compatible with Rails 3.
+factory_girl_rails provides Rails integration for [factory_girl][fg].
Currently, automatic factory definition loading is the only Rails-specific
feature.
-Download
---------
+Supported Rails versions are listed in [`Appraisals`](Appraisals). Supported
+Ruby versions are listed in [`.travis.yml`](.travis.yml).
-Github: http://github.com/thoughtbot/factory_girl_rails/tree/master
+## Download
+
+Github: http://github.com/thoughtbot/factory_girl_rails
Gem:
gem install factory_girl_rails
-Configuration
--------------
+## Configuration
Add `factory_girl_rails` to your Gemfile:
- gem 'factory_girl_rails'
+```ruby
+gem 'factory_girl_rails'
+```
Generators for factories will automatically substitute fixture (and maybe any
other
`fixture_replacement` you set). If you want to disable this feature, add the
following to your application.rb file:
- config.generators do |g|
- g.factory_girl false
- end
+```ruby
+config.generators do |g|
+ g.factory_girl false
+end
+```
Default factories directory is `test/factories`, or `spec/factories` if
`test_framework` generator is set to `:rspec`; change this behavior with:
- config.generators do |g|
- g.factory_girl dir: 'custom/dir/for/factories'
- end
-
-If you use `factory_girl` for fixture replacement, ensure that
-`factory_girl_rails` is available in the development group. If it's not, Rails
-will generate standard yml files instead of factory files.
-
-`factory_girl` takes an option `suffix: 'some_suffix'`
-to generate factories as "modelname_some_suffix.rb"
+```ruby
+config.generators do |g|
+ g.factory_girl dir: 'custom/dir/for/factories'
+end
+```
-More Information
-----------------
+If you use factory_girl for fixture replacement, ensure that
+factory_girl_rails is available in the development group. If it's not, Rails
+will generate standard .yml files instead of factory files.
-factory_girl: http://github.com/thoughtbot/factory_girl/tree/master
+factory_girl takes an option `suffix: 'some_suffix'` to generate factories as
+`modelname_some_suffix.rb`.
+If you use factory_girl for fixture replacement and already have a
+`factories.rb` file in the directory that contains your tests,
+factory_girl_rails will insert new factory definitions at the top of
+`factories.rb`.
-Contributing
-------------
+## Contributing
-Please see CONTRIBUTING.md for details.
+Please see [CONTRIBUTING.md](CONTRIBUTING.md).
-Credits
--------
+## Credits
-factory_girl was originally written by Joe Ferris.
+[factory_girl][fg] was originally written by Joe Ferris.
@@ -75,7 +76,14 @@
The names and logos for thoughtbot are trademarks of thoughtbot, inc.
-License
--------
+## License
-factory_girl is Copyright © 2008-2013 Joe Ferris and thoughtbot. It is free
software, and may be redistributed under the terms specified in the LICENSE
file.
+factory_girl_rails is Copyright © 2008-2014 Joe Ferris and thoughtbot. It is
free
+software, and may be redistributed under the terms specified in the
+[LICENSE]() file.
+
+[fg]: https://github.com/thoughtbot/factory_girl
+[ci]: http://travis-ci.org/thoughtbot/factory_girl_rails?branch=master
+[ci-image]: https://secure.travis-ci.org/thoughtbot/factory_girl_rails.png
+[grade]: https://codeclimate.com/github/thoughtbot/factory_girl_rails
+[grade-image]: https://codeclimate.com/github/thoughtbot/factory_girl_rails.png
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bin/setup new/bin/setup
--- old/bin/setup 1970-01-01 01:00:00.000000000 +0100
+++ new/bin/setup 2014-10-17 23:09:11.000000000 +0200
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# Run this script immediately after cloning the codebase.
+
+# Exit if any subcommand fails
+set -e
+
+# Set up Ruby dependencies via Bundler
+bundle install
+
+# Add binstubs to PATH in ~/.zshenv like this:
+# export PATH=".git/safe/../../bin:$PATH"
+mkdir -p .git/safe
+
+# Set up Appraisal to help us test against multiple Rails versions
+bundle exec appraisal install
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/factory_girl_rails.gemspec
new/factory_girl_rails.gemspec
--- old/factory_girl_rails.gemspec 2014-02-26 16:42:32.000000000 +0100
+++ new/factory_girl_rails.gemspec 2014-10-17 23:09:11.000000000 +0200
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = %q{factory_girl_rails}
- s.version = '4.4.1'
+ s.version = '4.5.0'
s.authors = ["Joe Ferris"]
s.email = %q{jfer...@thoughtbot.com}
s.homepage = "http://github.com/thoughtbot/factory_girl_rails";
@@ -11,17 +11,11 @@
loading)}
s.files = `git ls-files`.split("\n")
- s.test_files = `git ls-files -- Appraisals
{spec,features,gemfiles}/*`.split("\n")
+ s.test_files = `git ls-files -- {spec,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f|
File.basename(f) }
s.require_paths = ["lib"]
s.license = "MIT"
s.add_runtime_dependency('railties', '>= 3.0.0')
- s.add_runtime_dependency('factory_girl', '~> 4.4.0')
-
- s.add_development_dependency('appraisal', '~> 0.5.0')
- s.add_development_dependency('rake')
- s.add_development_dependency('rspec', '~> 2.11.0')
- s.add_development_dependency('cucumber', '~> 1.2.1')
- s.add_development_dependency('aruba', '~> 0.5.1')
+ s.add_runtime_dependency('factory_girl', '~> 4.5.0')
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/features/fixture_replacement_config.feature
new/features/fixture_replacement_config.feature
--- old/features/fixture_replacement_config.feature 2014-02-26
16:42:32.000000000 +0100
+++ new/features/fixture_replacement_config.feature 2014-10-17
23:09:11.000000000 +0200
@@ -1,5 +1,5 @@
Feature:
- In order to not have to manually configure factory girl as the testing
fixture replacement by using the --fixture-replacement=factory_girl option as a
Rails3 and Factory Girl user
+ In order to not have to manually configure Factory Girl as the Rails testing
fixture replacement by using the --fixture-replacement=factory_girl option
I would like the Factory Girl Rails gem to configure Factory Girl as the
fixture replacement.
Background:
@@ -54,29 +54,22 @@
But the following files should exist:
| custom/dir/users.rb |
- Scenario: Using Factory Girl and Factory Girl Rails with MiniTest should
generate a factory file
- When I add "minitest" as a dependency
- And I configure the testing framework to use MiniTest
- And I run `bundle install` with a clean environment
- Then the output should contain "minitest"
+ Scenario: Using Factory Girl Rails with MiniTest should generate a factory
file
+ When I run `bundle install` with a clean environment
And I run `bundle exec rails generate model User name:string` with a clean
environment
Then the following files should exist:
| test/factories/users.rb |
But the following files should not exist:
| spec/fixtures/users.yml |
- Scenario: Using Factory Girl and Factory Girl Rails with MiniTest and a
custom directory should generate a factory file
+ Scenario: Using Factory Girl Rails with MiniTest and a custom directory
should generate a factory file
When I configure the factories directory as "custom/dir"
- And I add "minitest" as a dependency
- And I configure the testing framework to use MiniTest
And I run `bundle install` with a clean environment
- Then the output should contain "minitest"
And I run `bundle exec rails generate model User name:string` with a clean
environment
Then the following files should exist:
| custom/dir/users.rb |
But the following files should not exist:
| spec/fixtures/users.yml |
- And the file "test/models/user_test.rb" should contain
"MiniTest::Rails::ActiveSupport::TestCase"
Scenario: Disable Factory Girl generator
When I configure the factories as:
@@ -90,3 +83,18 @@
Then the following files should not exist:
| test/factories/users.rb |
| spec/factories/users.rb |
+
+ Scenario: Use a suffix with the Factory Girl generator
+ When I add "rspec-rails" as a dependency
+ When I configure the factories as:
+ """
+ config.generators do |g|
+ g.factory_girl suffix: 'suffix'
+ end
+ """
+ And I run `bundle install` with a clean environment
+ And I run `bundle exec rails generate model User name:string` with a clean
environment
+ Then the following files should exist:
+ | spec/factories/users_suffix.rb |
+ Then the following files should not exist:
+ | spec/factories/users.rb |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/features/generators.feature
new/features/generators.feature
--- old/features/generators.feature 2014-02-26 16:42:32.000000000 +0100
+++ new/features/generators.feature 2014-10-17 23:09:11.000000000 +0200
@@ -1,6 +1,6 @@
Feature:
In order to easily generate factory files instead of fixture files when
generating models
- As a user of Rails3 and factory_girl
+ As a user of Rails and Factory Girl
I would like to use factory_girl_rails generators.
Background:
@@ -8,21 +8,21 @@
And I cd to "testapp"
And I add "factory_girl_rails" from this project as a dependency
- Scenario: The factory_girl_rails generators create a factory file for each
model that I generate
+ Scenario: The factory_girl_rails generators create a factory file for each
model if there is not a factories.rb file
When I run `bundle install` with a clean environment
- And I run `bundle exec rails generate model User name:string
--fixture-replacement=factory_girl` with a clean environment
- And I run `bundle exec rails generate model Namespaced::User name:string
--fixture-replacement=factory_girl` with a clean environment
+ And I run `bundle exec rails generate model User name:string` with a clean
environment
+ And I run `bundle exec rails generate model Namespaced::User name:string`
with a clean environment
Then the output should contain "test/factories/users.rb"
And the output should contain "test/factories/namespaced_users.rb"
And the file "test/factories/users.rb" should contain "factory :user do"
And the file "test/factories/namespaced_users.rb" should contain "factory
:namespaced_user, :class => 'Namespaced::User' do"
- Scenario: The factory_girl_rails generators create a factory file with a
custom name for each model that I generate
+ Scenario: The factory_girl_rails generators does not create a factory file
for each model if there is a factories.rb file in the test directory
When I run `bundle install` with a clean environment
- And I set the FactoryGirl :suffix option to "factory"
- And I run `bundle exec rails generate model User name:string
--fixture-replacement=factory_girl` with a clean environment
- And I run `bundle exec rails generate model Namespaced::User name:string
--fixture-replacement=factory_girl` with a clean environment
- Then the output should contain "test/factories/users_factory.rb"
- And the output should contain "test/factories/namespaced_users_factory.rb"
- And the file "test/factories/users_factory.rb" should contain "factory
:user do"
- And the file "test/factories/namespaced_users_factory.rb" should contain
"factory :namespaced_user, :class => 'Namespaced::User' do"
+ And I write to "test/factories.rb" with:
+ """
+ FactoryGirl.define do
+ end
+ """
+ And I run `bundle exec rails generate model User name:string` with a clean
environment
+ Then the file "test/factories.rb" should contain "factory :user do"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/features/load_definitions.feature
new/features/load_definitions.feature
--- old/features/load_definitions.feature 2014-02-26 16:42:32.000000000
+0100
+++ new/features/load_definitions.feature 2014-10-17 23:09:11.000000000
+0200
@@ -4,7 +4,6 @@
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 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:
"""
@@ -23,7 +22,7 @@
end
"""
- Scenario: generate a rails 3 application and use factory definitions
+ Scenario: generate a Rails application and use factory definitions
When I write to "test/factories.rb" with:
"""
FactoryGirl.define do
@@ -44,7 +43,7 @@
end
"""
When I run `bundle exec rake test --trace` with a clean environment
- Then the output should contain "1 tests, 1 assertions, 0 failures, 0
errors"
+ Then the output should contain "1 assertions, 0 failures, 0 errors"
Scenario: use factories advertised by railties/engines/3rd-party gems
When I append to "config/application.rb" with:
@@ -82,4 +81,4 @@
end
"""
When I run `bundle exec rake test --trace` with a clean environment
- Then the output should contain "1 tests, 1 assertions, 0 failures, 0
errors"
+ Then the output should contain "1 assertions, 0 failures, 0 errors"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/features/step_definitions/appraisal.rb
new/features/step_definitions/appraisal.rb
--- old/features/step_definitions/appraisal.rb 2014-02-26 16:42:32.000000000
+0100
+++ new/features/step_definitions/appraisal.rb 2014-10-17 23:09:11.000000000
+0200
@@ -1,5 +1,5 @@
When /^I run `([^"]+)` with a clean environment$/ do |command|
- step %{I successfully run `ruby -e 'system({"BUNDLE_GEMFILE" => nil},
"#{command}")'`}
+ step %{I successfully run `ruby -e 'system({"BUNDLE_GEMFILE" => nil,
"DISABLE_SPRING" => "true"}, "#{command}")'`}
end
# system({'BUNDLE_GEMFILE' => nil}, "cd tmp/aruba/testapp && #{command} && cd
-")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/features/step_definitions/rails_steps.rb
new/features/step_definitions/rails_steps.rb
--- old/features/step_definitions/rails_steps.rb 2014-02-26
16:42:32.000000000 +0100
+++ new/features/step_definitions/rails_steps.rb 2014-10-17
23:09:11.000000000 +0200
@@ -19,6 +19,14 @@
end
+When /^I print out "([^"]*)"$/ do |path|
+ in_current_dir do
+ File.open(path, 'r') do |f|
+ puts f.inspect
+ end
+ end
+end
+
When /^I configure the factories as:$/ do |string|
append_to_file File.join('config', 'application.rb'), <<-END
class Testapp::Application
@@ -35,19 +43,6 @@
end
end
END
-end
-
-When /^I configure the testing framework to use MiniTest$/ do
- append_to_file('Gemfile', %{gem "minitest-rails", :group => [:development,
:test]\n})
- step %{I run `rails generate mini_test:install` with a clean environment}
-
- append_to_file File.join('config', 'application.rb'), <<-END
-class Testapp::Application
- config.generators do |g|
- g.test_framework :mini_test, :fixture => false, :fixture_replacement =>
:factory_girl
- end
-end
- END
end
When /^I comment out gem "([^"]*)" from my Gemfile$/ do |gem_name|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gemfiles/rails3.1.gemfile
new/gemfiles/rails3.1.gemfile
--- old/gemfiles/rails3.1.gemfile 2014-02-26 16:42:32.000000000 +0100
+++ new/gemfiles/rails3.1.gemfile 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org";
-
-gem "rails", "3.1.10"
-gem "sass-rails"
-gem "coffee-rails"
-gem "uglifier"
-gem "sqlite3", ">= 1.3.4", :platforms=>:mri
-gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
-gem "minitest-rails"
-gem "therubyrhino"
-gem "jquery-rails"
-gem "rspec-rails"
-
-gemspec :path=>"../"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gemfiles/rails3.1.gemfile.lock
new/gemfiles/rails3.1.gemfile.lock
--- old/gemfiles/rails3.1.gemfile.lock 2014-02-26 16:42:32.000000000 +0100
+++ new/gemfiles/rails3.1.gemfile.lock 1970-01-01 01:00:00.000000000 +0100
@@ -1,171 +0,0 @@
-PATH
- remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
- specs:
- factory_girl_rails (4.4.1)
- factory_girl (~> 4.4.0)
- railties (>= 3.0.0)
-
-GEM
- remote: https://rubygems.org/
- specs:
- actionmailer (3.1.10)
- actionpack (= 3.1.10)
- mail (~> 2.3.3)
- actionpack (3.1.10)
- activemodel (= 3.1.10)
- activesupport (= 3.1.10)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.6)
- rack-cache (~> 1.2)
- rack-mount (~> 0.8.2)
- rack-test (~> 0.6.1)
- sprockets (~> 2.0.4)
- activemodel (3.1.10)
- activesupport (= 3.1.10)
- builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.10)
- activemodel (= 3.1.10)
- activesupport (= 3.1.10)
- arel (~> 2.2.3)
- tzinfo (~> 0.3.29)
- activeresource (3.1.10)
- activemodel (= 3.1.10)
- activesupport (= 3.1.10)
- activesupport (3.1.10)
- multi_json (>= 1.0, < 1.3)
- appraisal (0.5.1)
- bundler
- rake
- arel (2.2.3)
- aruba (0.5.1)
- childprocess (~> 0.3.6)
- cucumber (>= 1.1.1)
- rspec-expectations (>= 2.7.0)
- builder (3.0.4)
- childprocess (0.3.7)
- ffi (~> 1.0, >= 1.0.6)
- coffee-rails (3.1.1)
- coffee-script (>= 2.2.0)
- railties (~> 3.1.0)
- coffee-script (2.2.0)
- coffee-script-source
- execjs
- coffee-script-source (1.4.0)
- cucumber (1.2.1)
- builder (>= 2.1.2)
- diff-lcs (>= 1.1.3)
- gherkin (~> 2.11.0)
- json (>= 1.4.6)
- diff-lcs (1.1.3)
- erubis (2.7.0)
- execjs (1.4.0)
- multi_json (~> 1.0)
- factory_girl (4.4.0)
- activesupport (>= 3.0.0)
- ffi (1.3.1)
- gherkin (2.11.6)
- json (>= 1.7.6)
- hike (1.2.1)
- i18n (0.6.1)
- jquery-rails (2.2.0)
- railties (>= 3.0, < 5.0)
- thor (>= 0.14, < 2.0)
- json (1.7.6)
- mail (2.3.3)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.19)
- minitest (4.4.0)
- minitest-rails (0.3)
- minitest (~> 4.0)
- rails (~> 3.0)
- multi_json (1.2.0)
- polyglot (0.3.3)
- rack (1.3.9)
- rack-cache (1.2)
- rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
- rack-ssl (1.3.3)
- rack
- rack-test (0.6.2)
- rack (>= 1.0)
- rails (3.1.10)
- actionmailer (= 3.1.10)
- actionpack (= 3.1.10)
- activerecord (= 3.1.10)
- activeresource (= 3.1.10)
- activesupport (= 3.1.10)
- bundler (~> 1.0)
- railties (= 3.1.10)
- railties (3.1.10)
- actionpack (= 3.1.10)
- activesupport (= 3.1.10)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (10.0.3)
- rdoc (3.12)
- json (~> 1.4)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.3)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.3)
- rspec-rails (2.11.4)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec (~> 2.11.0)
- sass (3.2.5)
- sass-rails (3.1.7)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (>= 3.1.10)
- tilt (~> 1.3.2)
- sprockets (2.0.4)
- hike (~> 1.2)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.7)
- therubyrhino (2.0.2)
- therubyrhino_jar (>= 1.7.3)
- therubyrhino_jar (1.7.4)
- thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.12)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.35)
- uglifier (1.3.0)
- execjs (>= 0.3.0)
- multi_json (~> 1.0, >= 1.0.2)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- activerecord-jdbcsqlite3-adapter (~> 1.2.5)
- appraisal (~> 0.5.0)
- aruba (~> 0.5.1)
- coffee-rails
- cucumber (~> 1.2.1)
- factory_girl_rails!
- jquery-rails
- minitest-rails
- rails (= 3.1.10)
- rake
- rspec (~> 2.11.0)
- rspec-rails
- sass-rails
- sqlite3 (>= 1.3.4)
- therubyrhino
- uglifier
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gemfiles/rails3.2.gemfile
new/gemfiles/rails3.2.gemfile
--- old/gemfiles/rails3.2.gemfile 2014-02-26 16:42:32.000000000 +0100
+++ new/gemfiles/rails3.2.gemfile 2014-10-17 23:09:11.000000000 +0200
@@ -2,15 +2,16 @@
source "https://rubygems.org";
-gem "rails", "3.2.11"
-gem "sass-rails"
+gem "appraisal"
+gem "aruba"
gem "coffee-rails"
-gem "uglifier"
-gem "sqlite3", ">= 1.3.4", :platforms=>:mri
-gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
-gem "minitest-rails"
-gem "therubyrhino"
+gem "cucumber"
gem "jquery-rails"
+gem "rake"
gem "rspec-rails"
+gem "uglifier"
+gem "sqlite3"
+gem "rails", "~> 3.2.18"
+gem "sass-rails"
-gemspec :path=>"../"
\ No newline at end of file
+gemspec :path => "../"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gemfiles/rails3.2.gemfile.lock
new/gemfiles/rails3.2.gemfile.lock
--- old/gemfiles/rails3.2.gemfile.lock 2014-02-26 16:42:32.000000000 +0100
+++ new/gemfiles/rails3.2.gemfile.lock 1970-01-01 01:00:00.000000000 +0100
@@ -1,169 +0,0 @@
-PATH
- remote: /Users/joshuaclayton/dev/gems/factory_girl_rails
- specs:
- factory_girl_rails (4.4.1)
- factory_girl (~> 4.4.0)
- railties (>= 3.0.0)
-
-GEM
- remote: https://rubygems.org/
- specs:
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
- mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- journey (~> 1.0.4)
- rack (~> 1.4.0)
- rack-cache (~> 1.2)
- rack-test (~> 0.6.1)
- sprockets (~> 2.2.1)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
- builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- arel (~> 3.0.2)
- tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
- i18n (~> 0.6)
- multi_json (~> 1.0)
- appraisal (0.5.1)
- bundler
- rake
- arel (3.0.2)
- aruba (0.5.1)
- childprocess (~> 0.3.6)
- cucumber (>= 1.1.1)
- rspec-expectations (>= 2.7.0)
- builder (3.0.4)
- childprocess (0.3.7)
- ffi (~> 1.0, >= 1.0.6)
- coffee-rails (3.2.2)
- coffee-script (>= 2.2.0)
- railties (~> 3.2.0)
- coffee-script (2.2.0)
- coffee-script-source
- execjs
- coffee-script-source (1.4.0)
- cucumber (1.2.1)
- builder (>= 2.1.2)
- diff-lcs (>= 1.1.3)
- gherkin (~> 2.11.0)
- json (>= 1.4.6)
- diff-lcs (1.1.3)
- erubis (2.7.0)
- execjs (1.4.0)
- multi_json (~> 1.0)
- factory_girl (4.4.0)
- activesupport (>= 3.0.0)
- ffi (1.3.1)
- gherkin (2.11.6)
- json (>= 1.7.6)
- hike (1.2.1)
- i18n (0.6.1)
- journey (1.0.4)
- jquery-rails (2.2.0)
- railties (>= 3.0, < 5.0)
- thor (>= 0.14, < 2.0)
- json (1.7.6)
- mail (2.4.4)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.19)
- minitest (4.4.0)
- minitest-rails (0.3)
- minitest (~> 4.0)
- rails (~> 3.0)
- multi_json (1.5.0)
- polyglot (0.3.3)
- rack (1.4.4)
- rack-cache (1.2)
- rack (>= 0.4)
- rack-ssl (1.3.3)
- rack
- rack-test (0.6.2)
- rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
- bundler (~> 1.0)
- railties (= 3.2.11)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (>= 0.14.6, < 2.0)
- rake (10.0.3)
- rdoc (3.12)
- json (~> 1.4)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.3)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.3)
- rspec-rails (2.11.4)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- railties (>= 3.0)
- rspec (~> 2.11.0)
- sass (3.2.5)
- sass-rails (3.2.6)
- railties (~> 3.2.0)
- sass (>= 3.1.10)
- tilt (~> 1.3)
- sprockets (2.2.2)
- hike (~> 1.2)
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.7)
- therubyrhino (2.0.2)
- therubyrhino_jar (>= 1.7.3)
- therubyrhino_jar (1.7.4)
- thor (0.17.0)
- tilt (1.3.3)
- treetop (1.4.12)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.35)
- uglifier (1.3.0)
- execjs (>= 0.3.0)
- multi_json (~> 1.0, >= 1.0.2)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- activerecord-jdbcsqlite3-adapter (~> 1.2.5)
- appraisal (~> 0.5.0)
- aruba (~> 0.5.1)
- coffee-rails
- cucumber (~> 1.2.1)
- factory_girl_rails!
- jquery-rails
- minitest-rails
- rails (= 3.2.11)
- rake
- rspec (~> 2.11.0)
- rspec-rails
- sass-rails
- sqlite3 (>= 1.3.4)
- therubyrhino
- uglifier
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gemfiles/rails4.0.gemfile
new/gemfiles/rails4.0.gemfile
--- old/gemfiles/rails4.0.gemfile 1970-01-01 01:00:00.000000000 +0100
+++ new/gemfiles/rails4.0.gemfile 2014-10-17 23:09:11.000000000 +0200
@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org";
+
+gem "appraisal"
+gem "aruba"
+gem "coffee-rails"
+gem "cucumber"
+gem "jquery-rails"
+gem "rake"
+gem "rspec-rails"
+gem "uglifier"
+gem "sqlite3"
+gem "rails", "~> 4.0.5"
+gem "sass-rails"
+
+gemspec :path => "../"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gemfiles/rails4.1.gemfile
new/gemfiles/rails4.1.gemfile
--- old/gemfiles/rails4.1.gemfile 1970-01-01 01:00:00.000000000 +0100
+++ new/gemfiles/rails4.1.gemfile 2014-10-17 23:09:11.000000000 +0200
@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org";
+
+gem "appraisal"
+gem "aruba"
+gem "coffee-rails"
+gem "cucumber"
+gem "jquery-rails"
+gem "rake"
+gem "rspec-rails"
+gem "uglifier"
+gem "sqlite3"
+gem "rails", "~> 4.1.1"
+gem "sass-rails", "~> 4.0.3"
+gem "spring"
+
+gemspec :path => "../"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/factory_girl_rails/generators/rspec_generator.rb
new/lib/factory_girl_rails/generators/rspec_generator.rb
--- old/lib/factory_girl_rails/generators/rspec_generator.rb 2014-02-26
16:42:32.000000000 +0100
+++ new/lib/factory_girl_rails/generators/rspec_generator.rb 2014-10-17
23:09:11.000000000 +0200
@@ -16,7 +16,7 @@
end
def factory_girl_directory
- @generators.options.fetch(:factory_girl, { dir: 'spec/factories'
})[:dir]
+ @generators.options.fetch(:factory_girl, {}).fetch(:dir,
'spec/factories')
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/generators/factory_girl/model/model_generator.rb
new/lib/generators/factory_girl/model/model_generator.rb
--- old/lib/generators/factory_girl/model/model_generator.rb 2014-02-26
16:42:32.000000000 +0100
+++ new/lib/generators/factory_girl/model/model_generator.rb 2014-10-17
23:09:11.000000000 +0200
@@ -4,28 +4,82 @@
module FactoryGirl
module Generators
class ModelGenerator < Base
- argument :attributes, :type => :array, :default => [], :banner =>
"field:type field:type"
- class_option :dir, :type => :string, :default => "test/factories", :desc
=> "The directory where the factories should go"
+ argument(
+ :attributes,
+ type: :array,
+ default: [],
+ banner: "field:type field:type"
+ )
+
+ class_option(
+ :dir,
+ type: :string,
+ default: "test/factories",
+ desc: "The directory or file root where factories belong"
+ )
def create_fixture_file
- filename = [table_name, filename_suffix].compact.join('_')
- template 'fixtures.erb', File.join(options[:dir], "#{filename}.rb")
+ if File.exist?(factories_file)
+ insert_factory_into_existing_file
+ else
+ create_factory_file
+ end
end
private
+ def factories_file
+ options[:dir] + ".rb"
+ end
+
+ def insert_factory_into_existing_file
+ insert_into_file(
+ factories_file,
+ factory_definition,
+ after: "FactoryGirl.define do"
+ )
+ end
+
+ def create_factory_file
+ filename = [table_name, filename_suffix].compact.join('_')
+ file = File.join(options[:dir], "#{filename}.rb")
+ create_file(file, single_file_factory_definition)
+ end
+
+ def factory_definition
+<<-RUBY
+ factory :#{singular_table_name}#{explicit_class_option} do
+ #{factory_attributes}
+ end
+RUBY
+ end
+
+ def single_file_factory_definition
+<<-RUBY
+FactoryGirl.define do
+#{factory_definition}
+end
+RUBY
+ end
+
+ def factory_attributes
+ attributes.map do |attribute|
+ "#{attribute.name} #{attribute.default.inspect}"
+ end.join("\n")
+ end
+
def filename_suffix
factory_girl_options[:suffix]
end
+ def factory_girl_options
+ generators.options[:factory_girl] || {}
+ end
+
def generators
config = FactoryGirl::Railtie.config
config.respond_to?(:app_generators) ? config.app_generators :
config.generators
end
-
- def factory_girl_options
- generators.options[:factory_girl] || {}
- end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/generators/factory_girl/model/templates/fixtures.erb
new/lib/generators/factory_girl/model/templates/fixtures.erb
--- old/lib/generators/factory_girl/model/templates/fixtures.erb
2014-02-26 16:42:32.000000000 +0100
+++ new/lib/generators/factory_girl/model/templates/fixtures.erb
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
- factory :<%= singular_table_name %><%= explicit_class_option %> do
-<% for attribute in attributes -%>
- <%= attribute.name %> <%= attribute.default.inspect %>
-<% end -%>
- end
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2014-02-26 16:42:32.000000000 +0100
+++ new/metadata 2014-10-17 23:09:11.000000000 +0200
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: factory_girl_rails
version: !ruby/object:Gem::Version
- version: 4.4.1
+ version: 4.5.0
platform: ruby
authors:
- Joe Ferris
autorequire:
bindir: bin
cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: railties
@@ -30,90 +30,21 @@
requirements:
- - "~>"
- !ruby/object:Gem::Version
- version: 4.4.0
+ version: 4.5.0
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - "~>"
- !ruby/object:Gem::Version
- version: 4.4.0
-- !ruby/object:Gem::Dependency
- name: appraisal
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 0.5.0
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 0.5.0
-- !ruby/object:Gem::Dependency
- name: rake
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-- !ruby/object:Gem::Dependency
- name: rspec
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 2.11.0
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 2.11.0
-- !ruby/object:Gem::Dependency
- name: cucumber
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 1.2.1
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 1.2.1
-- !ruby/object:Gem::Dependency
- name: aruba
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 0.5.1
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: 0.5.1
+ version: 4.5.0
description: |-
factory_girl_rails provides integration between
factory_girl and rails 3 (currently just automatic factory definition
loading)
email: jfer...@thoughtbot.com
-executables: []
+executables:
+- setup
extensions: []
extra_rdoc_files: []
files:
@@ -122,10 +53,12 @@
- Appraisals
- CONTRIBUTING.md
- Gemfile
+- Gemfile.lock
- LICENSE
- NEWS
- README.md
- Rakefile
+- bin/setup
- factory_girl_rails.gemspec
- features/fixture_replacement_config.feature
- features/generators.feature
@@ -133,10 +66,9 @@
- features/step_definitions/appraisal.rb
- features/step_definitions/rails_steps.rb
- features/support/env.rb
-- gemfiles/rails3.1.gemfile
-- gemfiles/rails3.1.gemfile.lock
- gemfiles/rails3.2.gemfile
-- gemfiles/rails3.2.gemfile.lock
+- gemfiles/rails4.0.gemfile
+- gemfiles/rails4.1.gemfile
- lib/factory_girl_rails.rb
- lib/factory_girl_rails/generator.rb
- lib/factory_girl_rails/generators/non_rspec_generator.rb
@@ -145,7 +77,6 @@
- lib/factory_girl_rails/railtie.rb
- lib/generators/factory_girl.rb
- lib/generators/factory_girl/model/model_generator.rb
-- lib/generators/factory_girl/model/templates/fixtures.erb
homepage: http://github.com/thoughtbot/factory_girl_rails
licenses:
- MIT
@@ -166,19 +97,15 @@
version: '0'
requirements: []
rubyforge_project:
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
signing_key:
specification_version: 4
summary: factory_girl_rails provides integration between factory_girl and
rails 3
test_files:
-- Appraisals
- features/fixture_replacement_config.feature
- features/generators.feature
- features/load_definitions.feature
- features/step_definitions/appraisal.rb
- features/step_definitions/rails_steps.rb
- features/support/env.rb
-- gemfiles/rails3.1.gemfile
-- gemfiles/rails3.1.gemfile.lock
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails3.2.gemfile.lock
+has_rdoc:
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
