spec/examples/generic_adapter_examples.rb in apartment-1.0.2 vs spec/examples/generic_adapter_examples.rb in apartment-1.1.0

@@ -12,53 +12,53 @@
   #   Creates happen already in our before_filter
   #
   describe "#create" do
 
     it "should create the new databases" do
-      tenant_names.should include(db1)
-      tenant_names.should include(db2)
+      expect(tenant_names).to include(db1)
+      expect(tenant_names).to include(db2)
     end
 
     it "should load schema.rb to new schema" do
       subject.switch(db1) do
-        connection.tables.should include('companies')
+        expect(connection.tables).to include('companies')
       end
     end
 
     it "should yield to block if passed and reset" do
       subject.drop(db2) # so we don't get errors on creation
 
       @count = 0  # set our variable so its visible in and outside of blocks
 
       subject.create(db2) do
         @count = User.count
-        subject.current.should == db2
+        expect(subject.current).to eq(db2)
         User.create
       end
 
-      subject.current.should_not == db2
+      expect(subject.current).not_to eq(db2)
 
-      subject.switch(db2){ User.count.should == @count + 1 }
+      subject.switch(db2){ expect(User.count).to eq(@count + 1) }
     end
   end
 
   describe "#drop" do
     it "should remove the db" do
       subject.drop db1
-      tenant_names.should_not include(db1)
+      expect(tenant_names).not_to include(db1)
     end
   end
 
   describe "#switch!" do
     it "should connect to new db" do
       subject.switch!(db1)
-      subject.current.should == db1
+      expect(subject.current).to eq(db1)
     end
 
     it "should reset connection if database is nil" do
       subject.switch!
-      subject.current.should == default_tenant
+      expect(subject.current).to eq(default_tenant)
     end
 
     it "should raise an error if database is invalid" do
       expect {
         subject.switch! 'unknown_database'
@@ -67,13 +67,13 @@
   end
 
   describe "#switch" do
     it "connects and resets the tenant" do
       subject.switch(db1) do
-        subject.current.should == db1
+        expect(subject.current).to eq(db1)
       end
-      subject.current.should == default_tenant
+      expect(subject.current).to eq(default_tenant)
     end
 
     # We're often finding when using Apartment in tests, the `current` (ie the previously connect to db)
     # gets dropped, but switch will try to return to that db in a test.  We should just reset if it doesn't exist
     it "should not throw exception if current is no longer accessible" do
@@ -86,35 +86,35 @@
 
     it "warns if no block is given, but calls switch!" do
       expect(Apartment::Deprecation).to receive(:warn)
 
       subject.switch(db1)
-      subject.current.should == db1
+      expect(subject.current).to eq(db1)
     end
   end
 
   describe "#process" do
     it "is deprecated" do
       expect(Apartment::Deprecation).to receive(:warn)
 
       subject.process(db1) do
-        subject.current.should == db1
+        expect(subject.current).to eq(db1)
       end
     end
   end
 
   describe "#reset" do
     it "should reset connection" do
       subject.switch!(db1)
       subject.reset
-      subject.current.should == default_tenant
+      expect(subject.current).to eq(default_tenant)
     end
   end
 
   describe "#current" do
     it "should return the current db name" do
       subject.switch!(db1)
-      subject.current.should == db1
+      expect(subject.current).to eq(db1)
     end
   end
 
   describe "#each" do
     it "iterates over each tenant by default" do