improvements

Author: stanley90

spec/mongoid/paranoia_spec.rb

@@ -101,14 +101,19 @@ class ParanoidConfiguredReset
   describe ".with_deleted" do
 
     let(:posts) do
-      2.times { |i| ParanoidPost.create(title: "testing #{i}") }
+      2.times.map { |i| ParanoidPost.create(title: "testing #{i}") }
     end
 
-    before do
-      Mongoid.configure do |config|
-        config.try(:allow_scopes_to_unset_default_scope=, true)
-      end
+    around do |example|
+      original_value = Mongoid.allow_scopes_to_unset_default_scope
+      Mongoid.configure { |config| config.allow_scopes_to_unset_default_scope = true }
+
+      example.run
 
+      Mongoid.configure { |config| config.allow_scopes_to_unset_default_scope = original_value }
+    end
+
+    before do
       posts.first.destroy
     end
 
@@ -119,7 +124,7 @@ class ParanoidConfiguredReset
     it "returns the deleted documents" do
       expect(with_deleted).to eq(posts)
     end
-  end if respond_to?(:allow_scopes_to_unset_default_scope=)
+  end if Mongoid.respond_to?(:allow_scopes_to_unset_default_scope=)
 
   describe "#destroy!" do
 

spec/mongoid/scoping_spec.rb

@@ -58,15 +58,18 @@
         Fish.fresh.with_deleted
       end
 
-      if respond_to?(:allow_scopes_to_unset_default_scope=)
-        before do
-          Mongoid.configure do |config|
-            config.try(:allow_scopes_to_unset_default_scope=, true)
-          end
-
-          it "removes only deleted_at from the selector" do
-            expect(criteria.selector).to eq({ "fresh" => true })
-          end
+      if Mongoid.respond_to?(:allow_scopes_to_unset_default_scope=)
+        around do |example|
+          original_value = Mongoid.allow_scopes_to_unset_default_scope
+          Mongoid.configure { |config| config.allow_scopes_to_unset_default_scope = true }
+
+          example.run
+
+          Mongoid.configure { |config| config.allow_scopes_to_unset_default_scope = original_value }
+        end
+
+        it "removes only deleted_at from the selector" do
+          expect(criteria.selector).to eq({ "fresh" => true })
         end
       else
         it "raises an error if the feature is not supported" do