factory_girl 4.1.0 → 4.2.0

data/spec/factory_girl/sequence_spec.rb

@@ -5,64 +5,64 @@ describe FactoryGirl::Sequence do
     let(:name) { :test }
     subject    { FactoryGirl::Sequence.new(name) {|n| "=#{n}" } }
 
-    its(:name)  { should == name }
-    its(:names) { should == [name] }
-    its(:next)  { should == "=1" }
+    its(:name)  { should eq name }
+    its(:names) { should eq [name] }
+    its(:next)  { should eq "=1" }
 
     describe "when incrementing" do
       before     { subject.next }
-      its(:next) { should == "=2" }
+      its(:next) { should eq "=2" }
     end
   end
 
   describe "a custom sequence" do
     subject    { FactoryGirl::Sequence.new(:name, "A") {|n| "=#{n}" } }
-    its(:next) { should == "=A" }
+    its(:next) { should eq "=A" }
 
     describe "when incrementing" do
       before     { subject.next }
-      its(:next) { should == "=B" }
+      its(:next) { should eq "=B" }
     end
   end
 
   describe "a sequence with aliases using default value" do
     subject     { FactoryGirl::Sequence.new(:test, aliases: [:alias, :other]) { |n| "=#{n}" } }
-    its(:next)  { should == "=1" }
-    its(:names) { should == [:test, :alias, :other] }
+    its(:next)  { should eq "=1" }
+    its(:names) { should eq [:test, :alias, :other] }
 
     describe "when incrementing" do
       before     { subject.next }
-      its(:next) { should == "=2" }
+      its(:next) { should eq "=2" }
     end
   end
 
   describe "a sequence with custom value and aliases" do
     subject    { FactoryGirl::Sequence.new(:test, 3, aliases: [:alias, :other]) { |n| "=#{n}" } }
-    its(:next) { should == "=3" }
+    its(:next) { should eq "=3" }
 
     describe "when incrementing" do
       before     { subject.next }
-      its(:next) { should == "=4" }
+      its(:next) { should eq "=4" }
     end
   end
 
   describe "a basic sequence without a block" do
     subject    { FactoryGirl::Sequence.new(:name) }
-    its(:next) { should == 1 }
+    its(:next) { should eq 1 }
 
     describe "when incrementing" do
       before     { subject.next }
-      its(:next) { should == 2 }
+      its(:next) { should eq 2 }
     end
   end
 
   describe "a custom sequence without a block" do
     subject    { FactoryGirl::Sequence.new(:name, "A") }
-    its(:next) { should == "A" }
+    its(:next) { should eq "A" }
 
     describe "when incrementing" do
       before     { subject.next }
-      its(:next) { should == "B" }
+      its(:next) { should eq "B" }
     end
   end
 
@@ -70,9 +70,26 @@ describe FactoryGirl::Sequence do
     subject { FactoryGirl::Sequence.new(:name, %w[foo bar].to_enum) {|n| "=#{n}" } }
 
     it "navigates to the next items until no items remain" do
-      subject.next.should == "=foo"
-      subject.next.should == "=bar"
+      expect(subject.next).to eq "=foo"
+      expect(subject.next).to eq "=bar"
       expect { subject.next }.to raise_error(StopIteration)
     end
   end
+
+  describe "a custom sequence and scope" do
+    subject { FactoryGirl::Sequence.new(:name, 'A') {|n| "=#{n}#{foo}" } }
+    let(:scope) { stub('scope', foo: 'attribute') }
+
+    it 'increments within the correct scope' do
+      expect(subject.next(scope)).to eq '=Aattribute'
+    end
+
+    describe 'when incrementing' do
+      before { subject.next(scope) }
+
+      it 'increments within the correct scope' do
+        expect(subject.next(scope)).to eq '=Battribute'
+      end
+    end
+  end
 end

data/spec/factory_girl/strategy/attributes_for_spec.rb

@@ -7,7 +7,7 @@ describe FactoryGirl::Strategy::AttributesFor do
   it_should_behave_like "strategy without association support"
 
   it "returns the hash from the evaluation" do
-    subject.result(evaluation).should == result
+    expect(subject.result(evaluation)).to eq result
   end
 
   it "does not run the to_create block" do

data/spec/factory_girl/strategy/create_spec.rb

@@ -20,6 +20,6 @@ describe FactoryGirl::Strategy::Create do
     evaluation = evaluation_class.new
     evaluation.stubs(object: nil, notify: nil)
     subject.result(evaluation)
-    evaluation.block_run.should be_true
+    expect(evaluation.block_run).to be_true
   end
 end

data/spec/factory_girl/strategy/stub_spec.rb

@@ -15,16 +15,16 @@ describe FactoryGirl::Strategy::Stub do
 
     let(:evaluation)  { stub("evaluation", object: result_instance, notify: true) }
 
-    it { subject.result(evaluation).should_not be_new_record }
-    it { subject.result(evaluation).should be_persisted }
+    it { expect(subject.result(evaluation)).not_to be_new_record }
+    it { expect(subject.result(evaluation)).to be_persisted }
 
     it "assigns created_at" do
       created_at = subject.result(evaluation).created_at
-      created_at.should == Time.now
+      expect(created_at).to eq Time.now
 
       Timecop.travel(150000)
 
-      subject.result(evaluation).created_at.should == created_at
+      expect(subject.result(evaluation).created_at).to eq created_at
     end
 
     [:save, :destroy, :connection, :reload, :update_attribute].each do |database_method|

data/spec/factory_girl/strategy_calculator_spec.rb

@@ -9,7 +9,7 @@ describe FactoryGirl::StrategyCalculator do
     subject { FactoryGirl::StrategyCalculator.new(strategy).strategy }
 
     it "returns the class passed" do
-      subject.should == strategy
+      expect(subject).to eq strategy
     end
   end
 
@@ -19,11 +19,11 @@ describe FactoryGirl::StrategyCalculator do
 
     it "finds the strategy by name" do
       subject
-      FactoryGirl.should have_received(:strategy_by_name).with(:build)
+      expect(FactoryGirl).to have_received(:strategy_by_name).with(:build)
     end
 
     it "returns the strategy found" do
-      subject.should == strategy
+      expect(subject).to eq strategy
     end
   end
 end

data/spec/factory_girl_spec.rb

@@ -7,16 +7,16 @@ describe FactoryGirl do
 
   it "finds a registered factory" do
     FactoryGirl.register_factory(factory)
-    FactoryGirl.factory_by_name(factory.name).should == factory
+    expect(FactoryGirl.factory_by_name(factory.name)).to eq factory
   end
 
   it "finds a registered sequence" do
     FactoryGirl.register_sequence(sequence)
-    FactoryGirl.sequence_by_name(sequence.name).should == sequence
+    expect(FactoryGirl.sequence_by_name(sequence.name)).to eq sequence
   end
 
   it "finds a registered trait" do
     FactoryGirl.register_trait(trait)
-    FactoryGirl.trait_by_name(trait.name).should == trait
+    expect(FactoryGirl.trait_by_name(trait.name)).to eq trait
   end
 end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ require 'rspec/autorun'
 require "simplecov"
 
 require 'factory_girl'
-require "mocha"
+require "mocha/api"
 require "bourne"
 require "timecop"
 

data/spec/support/macros/define_constant.rb

@@ -13,8 +13,8 @@ module DefineConstantMacros
   def define_model(name, columns = {}, &block)
     model = define_class(name, ActiveRecord::Base, &block)
     create_table(model.table_name) do |table|
-      columns.each do |name, type|
-        table.column name, type
+      columns.each do |column_name, type|
+        table.column column_name, type
       end
     end
     model

data/spec/support/shared_examples/strategy.rb

@@ -14,7 +14,7 @@ shared_examples_for "strategy without association support" do
   end
 
   it "returns nil when accessing an association" do
-    association_named(:user, {}).should be_nil
+    expect(association_named(:user, {})).to be_nil
   end
 end
 
@@ -34,12 +34,12 @@ shared_examples_for "strategy with association support" do |factory_girl_strateg
 
   it "runs the factory with the correct overrides" do
     association_named(:author, factory_girl_strategy_name, great: "value")
-    factory.should have_received(:run).with(factory_girl_strategy_name, great: "value")
+    expect(factory).to have_received(:run).with(factory_girl_strategy_name, great: "value")
   end
 
   it "finds the factory with the correct factory name" do
     association_named(:author, factory_girl_strategy_name, great: "value")
-    FactoryGirl.should have_received(:factory_by_name).with(:author)
+    expect(FactoryGirl).to have_received(:factory_by_name).with(:author)
   end
 end
 
@@ -59,12 +59,12 @@ shared_examples_for "strategy with strategy: :build" do |factory_girl_strategy_n
 
   it "runs the factory with the correct overrides" do
     association_named(:author, strategy: :build, great: "value")
-    factory.should have_received(:run).with(factory_girl_strategy_name, { great: "value" })
+    expect(factory).to have_received(:run).with(factory_girl_strategy_name, { great: "value" })
   end
 
   it "finds the factory with the correct factory name" do
     association_named(:author, strategy: :build, great: "value")
-    FactoryGirl.should have_received(:factory_by_name).with(:author)
+    expect(FactoryGirl).to have_received(:factory_by_name).with(:author)
   end
 end
 
@@ -80,11 +80,11 @@ shared_examples_for "strategy with callbacks" do |*callback_names|
   it "runs the callbacks #{callback_names} with the evaluation's object" do
     subject.result(evaluation)
     callback_names.each do |name|
-      evaluation.should have_received(:notify).with(name, evaluation.object)
+      expect(evaluation).to have_received(:notify).with(name, evaluation.object)
     end
   end
 
   it "returns the object from the evaluation" do
-    subject.result(evaluation).should == evaluation.object
+    expect(subject.result(evaluation)).to eq evaluation.object
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.8
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,9 +155,9 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -226,6 +226,8 @@ files:
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
 - gemfiles/3.2.gemfile.lock
+- gemfiles/4.0.gemfile
+- gemfiles/4.0.gemfile.lock
 - lib/factory_girl.rb
 - lib/factory_girl/aliases.rb
 - lib/factory_girl/attribute.rb
@@ -304,6 +306,7 @@ files:
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/register_strategies_spec.rb
+- spec/acceptance/sequence_context_spec.rb
 - spec/acceptance/sequence_spec.rb
 - spec/acceptance/skip_create_spec.rb
 - spec/acceptance/stub_spec.rb
@@ -381,6 +384,8 @@ test_files:
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
 - gemfiles/3.2.gemfile.lock
+- gemfiles/4.0.gemfile
+- gemfiles/4.0.gemfile.lock
 - spec/acceptance/activesupport_instrumentation_spec.rb
 - spec/acceptance/aliases_spec.rb
 - spec/acceptance/attribute_aliases_spec.rb
@@ -407,6 +412,7 @@ test_files:
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/register_strategies_spec.rb
+- spec/acceptance/sequence_context_spec.rb
 - spec/acceptance/sequence_spec.rb
 - spec/acceptance/skip_create_spec.rb
 - spec/acceptance/stub_spec.rb