fixup! rearrange conditionals in fixture support

Author: pirj

lib/generators/rspec/install/templates/spec/rails_helper.rb

@@ -42,14 +42,14 @@
   # instead of true.
   config.use_transactional_fixtures = true
 
-  # You can uncomment this line to turn off active_record support entirely.
+  # You can uncomment this line to turn off ActiveRecord support entirely.
   # config.use_active_record = false
 
 <% else -%>
-  # Remove this line to enable support for active_record
+  # Remove this line to enable support for ActiveRecord
   config.use_active_record = false
 
-  # If you enable active_record support you shound unncomment these lines,
+  # If you enable ActiveRecord support you should unncomment these lines,
   # note if you'd prefer not to run each example within a transaction, you
   # should set use_transactional_fixtures to false.
   #

lib/rspec/rails/fixture_support.rb

@@ -10,18 +10,22 @@ module FixtureSupport
         include ActiveRecord::TestFixtures
 
         included do
-          FixtureSupport.setup if RSpec.configuration.use_active_record?
-        end
+          if RSpec.configuration.use_active_record?
+            include Fixtures
+
+            self.fixture_path = RSpec.configuration.fixture_path
+            if ::Rails::VERSION::STRING > '5'
+              self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
+            else
+              self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+            end
+            self.use_instantiated_fixtures = RSpec.configuration.use_instantiated_fixtures
 
-        def self.setup
-          self.fixture_path = RSpec.configuration.fixture_path
-          if ::Rails::VERSION::STRING > '5'
-            self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
-          else
-            self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+            fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
           end
-          self.use_instantiated_fixtures = RSpec.configuration.use_instantiated_fixtures
+        end
 
+        module Fixtures
           def self.fixtures(*args)
             orig_methods = private_instance_methods
             super.tap do
@@ -48,8 +52,6 @@ def name
               @example
             end
           end
-
-          fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
         end
       end
     end

spec/generators/rspec/install/install_generator_spec.rb

@@ -12,7 +12,7 @@ def content_for(file_name)
   end
 
   def have_a_fixture_path
-    match(/config\.fixture_path/m)
+    match(/^  config\.fixture_path = /m)
   end
 
   def maintain_test_schema
@@ -23,8 +23,16 @@ def require_rspec_rails
     match(/^require 'rspec\/rails'$/m)
   end
 
-  def have_transactional_fixtures_enabled?
-    match(/config\.use_transactional_fixtures/m)
+  def have_active_record_enabled
+    match(/^\  # config\.use_active_record = false/m)
+  end
+
+  def have_active_record_disabled
+    match(/^\  config\.use_active_record = false/m)
+  end
+
+  def have_transactional_fixtures_enabled
+    match(/^  config\.use_transactional_fixtures = true/m)
   end
 
   def filter_rails_from_backtrace
@@ -59,19 +67,24 @@ def filter_rails_from_backtrace
       expect(rails_helper).to require_rspec_rails
     end
 
-    specify "with transactional fixtures" do
+    specify "with ActiveRecord" do
       run_generator
-      expect(rails_helper).to have_a_fixture_path
+      expect(rails_helper).to have_active_record_enabled
+      expect(rails_helper).not_to have_active_record_disabled
     end
 
     specify "with default fixture path" do
       run_generator
-      expect(rails_helper).to have_transactional_fixtures_enabled?
+      expect(rails_helper).to have_a_fixture_path
     end
 
-    specify "excluding rails gems from the backtrace" do
+    specify "with transactional fixtures" do
       run_generator
+      expect(rails_helper).to have_transactional_fixtures_enabled
+    end
 
+    specify "excluding rails gems from the backtrace" do
+      run_generator
       expect(rails_helper).to filter_rails_from_backtrace
     end
 
@@ -91,14 +104,20 @@ def filter_rails_from_backtrace
       expect(rails_helper).to require_rspec_rails
     end
 
+    it "does not include config.use_active_record" do
+      run_generator
+      expect(rails_helper).not_to have_active_record_enabled
+      expect(rails_helper).to have_active_record_disabled
+    end
+
     it "does not include config.fixture_path" do
       run_generator
       expect(rails_helper).not_to have_a_fixture_path
     end
 
     it "does not include config.use_transactional_fixtures" do
       run_generator
-      expect(rails_helper).not_to have_transactional_fixtures_enabled?
+      expect(rails_helper).not_to have_transactional_fixtures_enabled
     end
 
     it "does not check use active record migration options" do
@@ -107,5 +126,4 @@ def filter_rails_from_backtrace
       expect(rails_helper).not_to maintain_test_schema
     end
   end
-
 end