factory_girl_rails 1.1.beta1 → 1.1.beta2

data/Gemfile

@@ -1,6 +1,3 @@
 source "http://rubygems.org"
-gem "cucumber"
-gem "aruba"
-gem "rake"
-gem "rspec"
 
+gemspec

data/Gemfile.lock

@@ -1,40 +1,115 @@
+PATH
+  remote: .
+  specs:
+    factory_girl_rails (1.1.beta1)
+      factory_girl (~> 2.0.0.beta)
+      railties (>= 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.2.3)
-      background_process
-      cucumber (~> 0.9.0)
-    background_process (1.2)
-    builder (2.1.2)
-    cucumber (0.9.2)
+    abstract (1.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.5)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.10)
+    aruba (0.4.3)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
+    builder (2.1.2)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (1.0.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    gherkin (2.2.8)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    json (1.4.6)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    factory_girl (2.0.0.beta3)
+    ffi (1.0.9)
+    gherkin (2.4.1)
+      json (>= 1.4.6)
+    i18n (0.5.0)
+    json (1.5.3)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rdiscount (1.6.8)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
     term-ansicolor (1.0.5)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aruba
-  cucumber
+  cucumber (~> 1.0.0)
+  factory_girl_rails!
+  rails (= 3.0.7)
   rake
-  rspec
+  rspec (~> 2.6.0)

data/{README.rdoc → README.md}

@@ -1,4 +1,5 @@
-= factory_girl
+factory_girl
+============
 
 factory_girl is a fixtures replacement with a straightforward definition
 syntax, support for multiple build strategies (saved instances, unsaved
@@ -6,34 +7,46 @@ 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.
 
 Currenty, automatic factory definition loading is the only Rails-specific feature.
 
-== Download
+Download
+--------
 
 Github: http://github.com/thoughtbot/factory_girl_rails/tree/master
 
 Gem:
-  gem install factory_girl_rails
+    gem install factory_girl_rails
 
-== Configuration
+Configuration
+-------------
 
 Add factory_girl Rails to your Gemfile:
 
-  gem 'factory_girl_rails'
+    gem 'factory_girl_rails'
 
-== More Information
+More Information
+----------------
 
 factory_girl: http://github.com/thoughtbot/factory_girl/tree/master
 
-== Author
+Credits
+-------
 
-factory_girl_rails was written by Joe Ferris.
+factory_girl was originally written by Joe Ferris
 
-Thanks to all members of thoughtbot for inspiration, ideas, and funding.
+![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
 
-Copyright 2010 Joe Ferris and thoughtbot[http://www.thoughtbot.com], inc.
+factory_girl is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)
+
+The names and logos for thoughtbot are trademarks of thoughtbot, inc.
+
+License
+-------
+
+factory_girl is Copyright © 2008-2011 Joe Ferris and thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/features/load_definitions.feature

@@ -2,10 +2,10 @@ Feature: automatically load step definitions
 
   @disable-bundler
   Scenario: generate a rails 3 application and use factory definitions
-    When I successfully run "rails new testapp"
+    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
-    When I successfully run "bundle install"
+    When I successfully run `bundle install`
     And I write to "db/migrate/1_create_users.rb" with:
       """
       class CreateUsers < ActiveRecord::Migration
@@ -16,7 +16,7 @@ Feature: automatically load step definitions
         end
       end
       """
-    When I successfully run "rake db:migrate --trace"
+    When I successfully run `bundle exec rake db:migrate --trace`
     And I write to "app/models/user.rb" with:
       """
       class User < ActiveRecord::Base
@@ -24,8 +24,10 @@ Feature: automatically load step definitions
       """
     When I write to "test/factories.rb" with:
       """
-      Factory.define :user do |user|
-        user.name 'Frank'
+      FactoryGirl.define do
+        factory :user do
+          name "Frank"
+        end
       end
       """
     When I write to "test/unit/user_test.rb" with:
@@ -34,10 +36,10 @@ Feature: automatically load step definitions
 
       class UserTest < ActiveSupport::TestCase
         test "use factory" do
-          user = Factory(:user)
+          user = FactoryGirl.create(:user)
           assert_equal 'Frank', user.name
         end
       end
       """
-    When I successfully run "rake test --trace"
+    When I successfully run `bundle exec rake test --trace`
     Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"

data/features/support/env.rb

@@ -1,3 +1,7 @@
-require 'aruba'
+require 'aruba/cucumber'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
+
+Before do
+  @aruba_timeout_seconds = 60
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl_rails
 version: !ruby/object:Gem::Version 
-  hash: 299253521
-  prerelease: true
+  hash: 62196303
+  prerelease: 4
   segments: 
   - 1
   - 1
-  - beta1
-  version: 1.1.beta1
+  - beta
+  - 2
+  version: 1.1.beta2
 platform: ruby
 authors: 
 - Joe Ferris
@@ -15,14 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -05:00
+date: 2011-06-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: railties
   prerelease: false
-  name: rails
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +33,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: factory_girl
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,12 +50,12 @@ dependencies:
         - 0
         - beta
         version: 2.0.0.beta
-  requirement: *id002
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: rake
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,26 +64,44 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
+        - 2
+        - 6
         - 0
-        version: "0"
-  requirement: *id004
+        version: 2.6.0
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: aruba
   prerelease: false
-  name: cucumber
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,7 +110,24 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 3
+        - 0
+        - 7
+        version: 3.0.7
+  type: :development
+  version_requirements: *id007
 description: |-
   factory_girl_rails provides integration between
       factory_girl and rails 3 (currently just automatic factory definition
@@ -109,7 +144,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - Rakefile
-- README.rdoc
+- README.md
 - lib/factory_girl_rails/railtie.rb
 - lib/factory_girl_rails.rb
 - features/load_definitions.feature
@@ -147,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: factory_girl_rails provides integration between factory_girl and rails 3