switchman 1.2.10 → 1.2.11

data/spec/dummy/tmp/cache/313/970/shard%2F30

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405709172.785986:@value":nil

data/spec/dummy/tmp/cache/316/980/shard%2F15

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405708977.5977442:@value":nil

data/spec/dummy/tmp/cache/317/9D0/shard%2F52

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405709563.027033:@value":nil

data/spec/dummy/tmp/cache/31C/A40/shard%2F75

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405709625.1911669:@value":nil

data/spec/dummy/tmp/cache/345/E00/shard%2F500

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056316.0856729:@value":nil

data/spec/dummy/tmp/cache/346/DF0/shard%2F321

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406054473.924482:@value":nil

data/spec/dummy/tmp/cache/349/DE0/shard%2F126

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405710273.4462678:@value":nil

data/spec/dummy/tmp/cache/349/E20/shard%2F243

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405710688.486557:@value":nil

data/spec/dummy/tmp/cache/34A/E40/shard%2F172

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405710383.000582:@value":nil

data/spec/dummy/tmp/cache/34A/E70/shard%2F523

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056335.05036:@value":nil

data/spec/dummy/tmp/cache/34A/EB0/shard%2F721

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�I"	name;TI"switchman_test_shard_721;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1406058474.6726232:@expires_in0

data/spec/dummy/tmp/cache/34A/EC0/shard%2F730

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�I"	name;TI"switchman_test_shard_730;TI"database_server_id;TI"2;TI"default;TF:@created_atf1406062223.73001:@expires_in0

data/spec/dummy/tmp/cache/34B/E60/shard%2F425

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056240.450111:@value":nil

data/spec/dummy/tmp/cache/34B/EC0/shard%2F722

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�I"	name;TI"switchman_test_shard_722;TI"database_server_id;TI"1;TI"default;TF:@created_atf1406058475.311327:@expires_in0

data/spec/dummy/tmp/cache/34C/E80/shard%2F273

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406054155.994775:@value":nil

data/spec/dummy/tmp/cache/34C/E90/shard%2F444

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056246.029251:@value":nil

data/spec/dummy/tmp/cache/34C/EA0/shard%2F615

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056444.206968:@value":nil

data/spec/dummy/tmp/cache/34C/F00/shard%2F750

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�I"	name;TI"switchman_test_shard_750;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1406062293.398787:@expires_in0

data/spec/dummy/tmp/cache/34D/E80/shard%2F265

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405710918.94204:@value":nil

data/spec/dummy/tmp/cache/34D/ED0/shard%2F391

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056233.44187:@value":nil

data/spec/dummy/tmp/cache/34D/EE0/shard%2F724

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�I"	name;TI"switchman_test_shard_724;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1406058508.056969:@expires_in0

data/spec/dummy/tmp/cache/34E/ED0/shard%2F383

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056187.420893:@value":nil

data/spec/dummy/tmp/cache/34E/EF0/shard%2F725

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�I"	name;TI"switchman_test_shard_725;TI"database_server_id;TI"1;TI"default;TF:@created_atf1406058508.1540139:@expires_in0

data/spec/dummy/tmp/cache/34E/F00/shard%2F653

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406057669.3963132:@value":nil

data/spec/dummy/tmp/cache/34F/EE0/shard%2F546

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056374.8069131:@value":nil

data/spec/dummy/tmp/cache/34F/F00/shard%2F807

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1406063237.6105049:@expires_in0

data/spec/dummy/tmp/cache/34F/F30/shard%2F672

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�I"	name;TI"switchman_test_shard_672;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1406057695.824834:@expires_in0

data/spec/dummy/tmp/cache/350/EA0/shard%2F178

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405710424.571912:@value":nil

data/spec/dummy/tmp/cache/350/EB0/shard%2F349

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056002.214963:@value":nil

data/spec/dummy/tmp/cache/350/F40/shard%2F592

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056439.333903:@value":nil

data/spec/dummy/tmp/cache/351/F10/shard%2F638

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056449.031681:@value":nil

data/spec/dummy/tmp/cache/352/F10/shard%2F468

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056287.720922:@value":nil

data/spec/dummy/tmp/cache/352/F30/shard%2F729

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�I"	name;TI"switchman_test_shard_729;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1406062223.7280169:@expires_in0

data/spec/dummy/tmp/cache/353/F10/shard%2F298

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406054467.519041:@value":nil

data/spec/dummy/tmp/cache/353/F50/shard%2F739

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1406062223.446721:@expires_in0

data/spec/dummy/tmp/cache/354/F50/shard%2F569

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056419.763446:@value":nil

data/spec/dummy/tmp/cache/354/F80/shard%2F677

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1406057694.251876:@expires_in0

data/spec/dummy/tmp/cache/354/F90/shard%2F767

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1406062291.6416168:@expires_in0

data/spec/dummy/tmp/cache/358/FE0/shard%2F699

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1406057711.1559649:@expires_in0

data/spec/dummy/tmp/cache/3A5/EA0/shard%2F10004

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405708977.399206:@value":nil

data/spec/dummy/tmp/cache/3A6/F40/shard%2F10410

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056240.6011572:@value":nil

data/spec/dummy/tmp/cache/3A7/F30/shard%2F10231

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405710688.293992:@value":nil

data/spec/dummy/tmp/cache/3A8/F90/shard%2F10520

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056335.088819:@value":nil

data/spec/dummy/tmp/cache/3A9/F40/shard%2F10062

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405709625.038962:@value":nil

data/spec/dummy/tmp/cache/3A9/F80/shard%2F10341

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056002.0330062:@value":nil

data/spec/dummy/tmp/cache/3AA/F10/shard%2F10027

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405709172.5864232:@value":nil

data/spec/dummy/tmp/cache/3AA/F10/shard%2F10108

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405710273.410322:@value":nil

data/spec/dummy/tmp/cache/3AA/FB0/shard%2F10441

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056246.067667:@value":nil

data/spec/dummy/tmp/cache/3AA/FC0/shard%2F10612

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056444.249256:@value":nil

data/spec/dummy/tmp/cache/3AB/010/shard%2F10730

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1406062223.318319:@expires_in0

data/spec/dummy/tmp/cache/3AB/F70/shard%2F10154

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405710383.047894:@value":nil

data/spec/dummy/tmp/cache/3AC/020/shard%2F10650

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406057669.4699311:@value":nil

data/spec/dummy/tmp/cache/3AC/FC0/shard%2F10272

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406054156.148363:@value":nil

data/spec/dummy/tmp/cache/3AD/000/shard%2F10543

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056374.8466759:@value":nil

data/spec/dummy/tmp/cache/3AD/F50/shard%2F10039

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405709562.825376:@value":nil

data/spec/dummy/tmp/cache/3AD/F90/shard%2F10318

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406054473.961097:@value":nil

data/spec/dummy/tmp/cache/3AD/FA0/shard%2F10246

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405710918.851407:@value":nil

data/spec/dummy/tmp/cache/3AE/060/shard%2F10751

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1406062291.6871822:@expires_in0

data/spec/dummy/tmp/cache/3AE/FF0/shard%2F10364

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056187.366626:@value":nil

data/spec/dummy/tmp/cache/3AF/030/shard%2F10635

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056449.071837:@value":nil

data/spec/dummy/tmp/cache/3B0/FE0/shard%2F10177

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1405710424.610155:@value":nil

data/spec/dummy/tmp/cache/3B1/030/shard%2F10295

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406054467.704592:@value":nil

data/spec/dummy/tmp/cache/3B1/040/shard%2F10466

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056287.545137:@value":nil

data/spec/dummy/tmp/cache/3B1/090/shard%2F10673

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1406057694.149458:@expires_in0

data/spec/dummy/tmp/cache/3B2/070/shard%2F10566

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056419.803245:@value":nil

data/spec/dummy/tmp/cache/3B3/060/shard%2F10387

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056233.548882:@value":nil

data/spec/dummy/tmp/cache/3B5/0B0/shard%2F10497

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056316.127557:@value":nil

data/spec/dummy/tmp/cache/3B6/100/shard%2F10696

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1406057710.8676522:@expires_in0

data/spec/dummy/tmp/cache/3B7/0E0/shard%2F10589

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1406056439.374727:@value":nil

data/spec/dummy/tmp/cache/3BA/160/shard%2F10799

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1406063237.677971:@expires_in0

data/spec/lib/action_controller/caching_spec.rb

@@ -20,13 +20,13 @@ module Switchman
           end
 
           it "should share the cache across shards on the same server" do
-            @shard1.activate{ subject.cache_store }.
-              should == @shard3.activate{ subject.cache_store }
+            expect(@shard1.activate{ subject.cache_store }).
+              to eq @shard3.activate{ subject.cache_store }
           end
 
           it "should not share the cache across shards on different servers" do
-            @shard1.activate{ subject.cache_store }.
-              should_not == @shard2.activate{ subject.cache_store }
+            expect(@shard1.activate{ subject.cache_store }).
+              not_to eq @shard2.activate{ subject.cache_store }
           end
         end
 

data/spec/lib/active_record/abstract_adapter_spec.rb

@@ -9,7 +9,7 @@ module Switchman
         conn = @shard1.activate{ User.connection }
         Time.stubs(:now).returns(conn.last_query_at + 1.minute)
         @shard1.activate{ User.create! }
-        conn.last_query_at.should == Time.now
+        expect(conn.last_query_at).to eq Time.now
       end
     end
   end

data/spec/lib/active_record/association_spec.rb

@@ -16,34 +16,34 @@ module Switchman
 
       it "should associate built objects with parent shard" do
         a1 = @user1.appendages.build
-        a1.shard.should == @shard1
+        expect(a1.shard).to eq @shard1
       end
 
       it "should associate created objects with parent shard" do
         a1 = @user1.appendages.create!
-        a1.shard.should == @shard1
+        expect(a1.shard).to eq @shard1
       end
 
       it "should set shard value to parent for association scope" do
         scope = @user1.appendages
         scope = ::Rails.version < '4' ? scope.scoped : scope.scope
-        scope.shard_value.should == @user1
-        scope.shard_source_value.should == :association
+        expect(scope.shard_value).to eq @user1
+        expect(scope.shard_source_value).to eq :association
       end
 
       it "should find by id through association" do
         a1 = @user1.appendages.create!
 
-        @user1.appendages.find(a1.id).should == a1
-        lambda { @user2.appendages.find(a1.id) }.should raise_exception(::ActiveRecord::RecordNotFound)
+        expect(@user1.appendages.find(a1.id)).to eq a1
+        expect { @user2.appendages.find(a1.id) }.to raise_exception(::ActiveRecord::RecordNotFound)
       end
 
       describe "transaction" do
         it "should activate the owner's shard and start the transaction on that shard" do
           base_value = @user1.shard.activate { User.connection.open_transactions }
           @user1.appendages.transaction(:requires_new => true) do
-            Shard.current.should == @shard1
-            User.connection.open_transactions.should == base_value + 1
+            expect(Shard.current).to eq @shard1
+            expect(User.connection.open_transactions).to eq base_value + 1
           end
         end
       end
@@ -51,42 +51,58 @@ module Switchman
       it "should get the record size" do
         a1 = @user1.appendages.create!
         a2 = @user1.appendages.build
-        @user1.appendages.size.should == 2
+        expect(@user1.appendages.size).to eq 2
         @user1.reload
-        @user1.appendages.size.should == 1
+        expect(@user1.appendages.size).to eq 1
       end
 
       it "should reverse the association" do
         a1 = @user1.appendages.create!
         a1.reload
-        a1.user.shard.should == @shard1
-        a1.user.should == @user1
+        expect(a1.user.shard).to eq @shard1
+        expect(a1.user).to eq @user1
       end
 
       it "should work with has_many through associations" do
         a1 = @user1.appendages.create!
         d1 = a1.digits.create!
-        d1.shard.should == @shard1
+        expect(d1.shard).to eq @shard1
 
         if ::Rails.version < '4'
-          @user1.digits.scoped.shard_value.should == @user1
+          expect(@user1.digits.scoped.shard_value).to eq @user1
         else
-          @user1.digits.scope.shard_value.should == @user1
+          expect(@user1.digits.scope.shard_value).to eq @user1
+        end
+        expect(@user1.digits.find(d1.id)).to eq d1
+      end
+
+      it "should resolve include? correctly for a has_many :through" do
+        @shard1.activate do
+          child = @user1.children.create!
+          @grandchild = child.children.create!
+          @user1.reload
+          expect(@user1.grandchildren.loaded?).to eq false
+          expect(@user1.grandchildren.include?(@grandchild)).to eq true
+        end
+        @shard2.activate do
+          fake = User.create!(id: @grandchild.local_id)
+          @user1.reload
+          expect(@user1.grandchildren.loaded?).to eq false
+          expect(@user1.grandchildren.include?(fake)).to eq false
         end
-        @user1.digits.find(d1.id).should == d1
       end
 
       it "shard should be changeable, and change conditions when it is changed" do
         a1 = @user1.appendages.create!
         relation = @user1.appendages.where(:id => a1).shard(@shard1)
-        relation.shard_value.should == @shard1
-        relation.shard_source_value.should == :explicit
-        relation.where_values.detect{|v| v.left.name == "id"}.right.should == a1.local_id
+        expect(relation.shard_value).to eq @shard1
+        expect(relation.shard_source_value).to eq :explicit
+        expect(relation.where_values.detect{|v| v.left.name == "id"}.right).to eq a1.local_id
 
         relation = @user1.appendages.where(:id => a1).shard(@shard2)
-        relation.shard_value.should == @shard2
-        relation.shard_source_value.should == :explicit
-        relation.where_values.detect{|v| v.left.name == "id"}.right.should == a1.global_id
+        expect(relation.shard_value).to eq @shard2
+        expect(relation.shard_source_value).to eq :explicit
+        expect(relation.where_values.detect{|v| v.left.name == "id"}.right).to eq a1.global_id
       end
 
       it "should transpose predicates correctly" do
@@ -94,12 +110,12 @@ module Switchman
         a2 = @user2.appendages.create!
 
         relation = @user1.appendages.where(:id => a2)
-        relation.shard_value.should == @user1
-        relation.where_values.detect{|v| v.left.name == "id"}.right.should == a2.global_id
+        expect(relation.shard_value).to eq @user1
+        expect(relation.where_values.detect{|v| v.left.name == "id"}.right).to eq a2.global_id
 
         relation = @user1.appendages.where(:id => [a1, a2])
-        relation.shard_value.should == @user1
-        relation.where_values.detect{|v| v.left.name == "id"}.right.should == [a1.local_id, a2.global_id]
+        expect(relation.shard_value).to eq @user1
+        expect(relation.where_values.detect{|v| v.left.name == "id"}.right).to eq [a1.local_id, a2.global_id]
       end
 
       it "should properly set up a cross-shard-category query" do
@@ -107,12 +123,12 @@ module Switchman
           mirror_user = MirrorUser.create!
           relation = mirror_user.association(:user)
           relation = ::Rails.version < '4' ? relation.scoped : relation.scope
-          relation.shard_value.should == Shard.default
+          expect(relation.shard_value).to eq Shard.default
           if ::Rails.version < '4'
-            relation.where_values.first.right.should == mirror_user.global_id
+            expect(relation.where_values.first.right).to eq mirror_user.global_id
           else
-            relation.where_values.first.right.should be_a(Arel::Nodes::BindParam)
-            relation.bind_values.map(&:last).should == [mirror_user.global_id]
+            expect(relation.where_values.first.right).to be_a(Arel::Nodes::BindParam)
+            expect(relation.bind_values.map(&:last)).to eq [mirror_user.global_id]
           end
         end
       end
@@ -122,22 +138,22 @@ module Switchman
           @shard1.activate{ Appendage.create!(:user_id => @user1, :value => 1) }
           @shard2.activate{ Appendage.create!(:user => @user1, :value => 2) }
 
-          @user1.appendages.to_a.map(&:value).should == [1]
+          expect(@user1.appendages.to_a.map(&:value)).to eq [1]
 
           @user1.reload
           @user1.associated_shards = [@shard1, @shard2]
-          @user1.appendages.to_a.map(&:value).sort.should == [1, 2]
+          expect(@user1.appendages.to_a.map(&:value).sort).to eq [1, 2]
         end
 
         it "follow shards for has_many :through" do
           @shard1.activate{ a1 = Appendage.create!(:user_id => @user1); a1.digits.create!(:value => 1) }
           @shard2.activate{ a2 = Appendage.create!(:user_id => @user1); a2.digits.create!(:value => 2) }
 
-          @user1.digits.to_a.map(&:value).should == [1]
+          expect(@user1.digits.to_a.map(&:value)).to eq [1]
 
           @user1.reload
           @user1.associated_shards = [@shard1, @shard2]
-          @user1.digits.to_a.map(&:value).sort.should == [1, 2]
+          expect(@user1.digits.to_a.map(&:value).sort).to eq [1, 2]
         end
 
         it "should include the shard in scopes created by associations" do
@@ -146,10 +162,10 @@ module Switchman
           @shard1.activate{ Appendage.create!(:user_id => @user1, :value => 1) }
           @shard2.activate{ Appendage.create!(:user => @user1) }
 
-          @user1.appendages.has_no_value.to_a.count.should == 1
+          expect(@user1.appendages.has_no_value.to_a.count).to eq 1
 
           @user1.reload
-          @shard2.activate {@user1.appendages.has_no_value.to_a.count.should == 1}
+          @shard2.activate {expect(@user1.appendages.has_no_value.to_a.count).to eq 1}
         end
 
         it "should include the shard in scopes created by has_many :through associations" do
@@ -158,10 +174,10 @@ module Switchman
           @shard1.activate{ a1 = Appendage.create!(:user_id => @user1); a1.digits.create! }
           @shard2.activate{ a2 = Appendage.create!(:user_id => @user1); a2.digits.create!(:value => 2) }
 
-          @user1.digits.has_no_value.count.should == 1
+          expect(@user1.digits.has_no_value.count).to eq 1
 
           @user1.reload
-          @shard2.activate {@user1.digits.has_no_value.to_a.count.should == 1}
+          @shard2.activate {expect(@user1.digits.has_no_value.to_a.count).to eq 1}
         end
 
         it "should work with calculations in scopes created by associations" do
@@ -171,10 +187,10 @@ module Switchman
           @shard2.activate{ Appendage.create!(:user => @user1); @user1.appendages.create!(:value => 2) }
 
           @user1.reload
-          @user1.appendages.has_value.sum(:value).should == 3
+          expect(@user1.appendages.has_value.sum(:value)).to eq 3
 
           @user1.reload
-          @shard2.activate {@user1.appendages.has_value.sum(:value).should == 3}
+          @shard2.activate {expect(@user1.appendages.has_value.sum(:value)).to eq 3}
         end
 
         it "should work with calculations in scopes created by has_many :through associations" do
@@ -182,9 +198,9 @@ module Switchman
           @shard1.activate{ a1 = Appendage.create!(:user_id => @user1); a1.digits.create!; a1.digits.create!(:value => 1) }
           @shard2.activate{ a2 = Appendage.create!(:user_id => @user1); a2.digits.create!(:value => 2) }
 
-          @user1.digits.has_value.sum(:value).should == 3
+          expect(@user1.digits.has_value.sum(:value)).to eq 3
           @user1.reload
-          @shard2.activate {@user1.digits.has_value.sum(:value).should == 3}
+          @shard2.activate {expect(@user1.digits.has_value.sum(:value)).to eq 3}
         end
 
         it "should be able to explicitly set the shard and still work with named scopes" do
@@ -193,22 +209,22 @@ module Switchman
           @shard1.activate{ a1 = Appendage.create!(:user_id => @user1); a1.digits.create! }
           @shard2.activate{ a2 = Appendage.create!(:user_id => @user1); a2.digits.create!(:value => 2) }
 
-          @user1.digits.shard(@shard1).has_no_value.to_a.count.should == 1
-          @user1.digits.shard(@shard2).has_no_value.to_a.count.should == 0
+          expect(@user1.digits.shard(@shard1).has_no_value.to_a.count).to eq 1
+          expect(@user1.digits.shard(@shard2).has_no_value.to_a.count).to eq 0
 
           @user1.reload
 
-          @user1.digits.has_no_value.shard(@shard1).to_a.count.should == 1
-          @user1.digits.has_no_value.shard(@shard2).to_a.count.should == 0
+          expect(@user1.digits.has_no_value.shard(@shard1).to_a.count).to eq 1
+          expect(@user1.digits.has_no_value.shard(@shard2).to_a.count).to eq 0
         end
 
         describe "unsharded associations" do
           it "should be able to create an unsharded new record through a collection" do
             root = @user2.roots.create!
             root.reload
-            root.shard.should == Shard.default
-            root.user_id.should == @user2.global_id
-            root.user.should == @user2
+            expect(root.shard).to eq Shard.default
+            expect(root.user_id).to eq @user2.global_id
+            expect(root.user).to eq @user2
           end
         end
 
@@ -216,7 +232,7 @@ module Switchman
           it "should identify an implied shard value based on the foreign id" do
             @shard1.activate do
               @appendage = Appendage.create!(:user_id => @user2.global_id)
-              @appendage.reload.user.should == @user2
+              expect(@appendage.reload.user).to eq @user2
             end
           end
 
@@ -228,8 +244,8 @@ module Switchman
               copy.shard = @user1.shard
               copy.save!
               copy.reload
-              copy.user.shard.should == @shard1
-              copy.user.should == @user1
+              expect(copy.user.shard).to eq @shard1
+              expect(copy.user).to eq @user1
             end
           end
         end
@@ -244,7 +260,7 @@ module Switchman
             appendages = Appendage.includes(:user).to_a
             @user1.delete
 
-            appendages.map(&:user).sort.should == [@user1, @user2, user3].sort
+            expect(appendages.map(&:user).sort).to eq [@user1, @user2, user3].sort
           end
 
           it "should preload belongs_to :through associations across shards" do
@@ -257,7 +273,7 @@ module Switchman
             digits = Digit.includes(:user).to_a
             @user1.delete
 
-            digits.map(&:user).sort.should == [@user1, @user2].sort
+            expect(digits.map(&:user).sort).to eq [@user1, @user2].sort
           end
 
           it "should preload has_many associations across associated shards" do
@@ -269,14 +285,14 @@ module Switchman
 
             begin
               users = User.where(:id => [@user1, @user2]).includes(:appendages).to_a
-              users.each {|u| u.appendages.loaded?.should be_true}
+              users.each {|u| expect(u.appendages.loaded?).to eq true}
 
               u1 = users.detect {|u| u.id == @user1.id}
               u2 = users.detect {|u| u.id == @user2.id}
 
               a1.delete
-              u1.appendages.sort.should == [a1, a2].sort
-              u2.appendages.should be_empty
+              expect(u1.appendages.sort).to eq [a1, a2].sort
+              expect(u2.appendages).to be_empty
             ensure
               User.associated_shards_map = nil
             end
@@ -305,15 +321,15 @@ module Switchman
 
             begin
               users = User.where(:id => [@user1, @user2]).includes(:digits).to_a
-              users.each {|u| u.digits.loaded?.should be_true}
+              users.each {|u| expect(u.digits.loaded?).to eq true}
 
               u1 = users.detect {|u| u.id == @user1.id}
               u2 = users.detect {|u| u.id == @user2.id}
 
               d1.delete
 
-              u1.digits.sort.should == [d1, d2, d3].sort
-              u2.digits.should == [d7]
+              expect(u1.digits.sort).to eq [d1, d2, d3].sort
+              expect(u2.digits).to eq [d7]
             ensure
               User.associated_shards_map = nil
               Appendage.associated_shards_map = nil
@@ -327,27 +343,27 @@ module Switchman
             feature = Feature.create!(:owner => appendage)
 
             feature.reload
-            feature.owner.should == appendage
-            feature.owner_id.should == appendage.id
-            feature.owner_type.should == "Appendage"
+            expect(feature.owner).to eq appendage
+            expect(feature.owner_id).to eq appendage.id
+            expect(feature.owner_type).to eq "Appendage"
 
             feature.owner = @user1
             feature.save!
 
             feature.reload
-            feature.owner_id.should == @user1.global_id
-            feature.owner_type.should == "User"
+            expect(feature.owner_id).to eq @user1.global_id
+            expect(feature.owner_type).to eq "User"
           end
 
           it "should work with multi-shard associations" do
             @shard1.activate{ Feature.create!(:owner => @user1, :value => 1) }
             @shard2.activate{ Feature.create!(:owner => @user1, :value => 2) }
 
-            @user1.features.to_a.map(&:value).should == [1]
+            expect(@user1.features.to_a.map(&:value)).to eq [1]
 
             @user1.reload
             @user1.associated_shards = [@shard1, @shard2]
-            @user1.features.to_a.map(&:value).sort.should == [1, 2]
+            expect(@user1.features.to_a.map(&:value).sort).to eq [1, 2]
           end
         end
       end