Rewinding all sequences and not just the global ones

lib/factory_bot.rb

@@ -107,6 +107,14 @@ def self.register_sequence(sequence)
     sequence
   end
 
+  def self.register_sequence_uuid(sequence)
+    return unless sequence
+    sequence.uuids.each do |uuid|
+      sequences.register(uuid, sequence)
+    end
+    sequence
+  end
+
   def self.sequence_by_name(name)
     sequences.find(name)
   end

lib/factory_bot/definition_proxy.rb

@@ -121,6 +121,7 @@ def method_missing(name, *args, &block)
     # Except that no globally available sequence will be defined.
     def sequence(name, *args, &block)
       sequence = Sequence.new(name, *args, &block)
+      FactoryBot.register_sequence_uuid(sequence)
       add_attribute(name) { increment_sequence(sequence) }
     end
 

lib/factory_bot/sequence.rb

@@ -19,6 +19,13 @@ def initialize(name, *args, &proc)
       end
     end
 
+    def uuids
+      proc = @proc || -> {}
+      names.map do |name|
+        [name, proc.try(:to_s)].join
+      end
+    end
+
     def next(scope = nil)
       if @proc && scope
         scope.instance_exec(value, &@proc)

spec/acceptance/sequence_resetting_spec.rb

@@ -3,6 +3,24 @@
 describe "FactoryBot.rewind_sequences" do
   include FactoryBot::Syntax::Methods
 
+  before do
+    define_model("User", age: :integer)
+    FactoryBot.define do
+      factory :user do
+        sequence(:id)
+        sequence(:age)
+      end
+    end
+
+    define_model("Project", number: :integer)
+    FactoryBot.define do
+      factory :project do
+        sequence(:id)
+        sequence(:number)
+      end
+    end
+  end
+
   it "resets all sequences back to their starting values" do
     FactoryBot.define do
       sequence(:email) { |n| "somebody#{n}@example.com" }
@@ -22,4 +40,75 @@
     expect(email).to eq "[email protected]"
     expect(name).to eq "Joe"
   end
+
+  it "resets sequences back to their starting values for factory sequences" do
+    user1 = FactoryBot.create(:user)
+    user2 = FactoryBot.create(:user)
+
+    expect(user1.id).to eq 1
+    expect(user1.age).to eq 1
+
+    expect(user2.id).to eq 2
+    expect(user2.age).to eq 2
+
+    User.destroy_all
+    FactoryBot.rewind_sequences
+
+    user1 = FactoryBot.create(:user)
+    user2 = FactoryBot.create(:user)
+    user3 = FactoryBot.create(:user)
+
+    expect(user1.id).to eq 1
+    expect(user1.age).to eq 1
+
+    expect(user2.id).to eq 2
+    expect(user2.age).to eq 2
+
+    expect(user3.id).to eq 3
+    expect(user3.age).to eq 3
+  end
+
+  it "resets without conflict with other factories" do
+    # Create users
+    user1 = FactoryBot.create(:user)
+    user2 = FactoryBot.create(:user)
+
+    expect(user1.id).to eq 1
+    expect(user1.age).to eq 1
+
+    expect(user2.id).to eq 2
+    expect(user2.age).to eq 2
+
+    # Create projects
+    project1 = FactoryBot.create(:project)
+    project2 = FactoryBot.create(:project)
+
+    expect(project1.id).to eq 1
+    expect(project1.number).to eq 1
+
+    expect(project2.id).to eq 2
+    expect(project2.number).to eq 2
+
+    User.destroy_all
+    Project.destroy_all
+    FactoryBot.rewind_sequences
+
+    user1 = FactoryBot.create(:user)
+    user2 = FactoryBot.create(:user)
+    expect(user1.id).to eq 1
+    expect(user1.age).to eq 1
+
+    expect(user2.id).to eq 2
+    expect(user2.age).to eq 2
+
+    # Create projects
+    project1 = FactoryBot.create(:project)
+    project2 = FactoryBot.create(:project)
+
+    expect(project1.id).to eq 1
+    expect(project1.number).to eq 1
+
+    expect(project2.id).to eq 2
+    expect(project2.number).to eq 2
+  end
 end