Refactor spec code

thiagopradi · Sep 27, 2013 · 05f54ec · 05f54ec
1 parent 2b45b87
commit 05f54ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/spec/octopus/proxy_spec.rb b/spec/octopus/proxy_spec.rb
@@ -254,7 +254,7 @@
         end
 
         it "should save all associated objects on the correct shard" do
-          subject.should_not raise_error
+          expect { subject }.to_not raise_error
         end
       end
 
@@ -265,7 +265,7 @@
         end
 
         it "should save all associated objects on the correct shard" do
-          subject.should_not raise_error
+          expect { subject }.to_not raise_error
         end
       end
     end

diff --git a/spec/support/octopus_helper.rb b/spec/support/octopus_helper.rb
@@ -9,13 +9,9 @@ def self.clean_all_shards(shards)
         BlankModel.using(shard_symbol).connection.execute("DELETE FROM #{tables}")
       end
 
-      if shard_symbol == :alone_shard
-        %w[
-          mmorpg_players
-          weapons
-          skills
-        ].each do |table|
-          BlankModel.using(shard_symbol).connection.execute("DELETE FROM #{tables}")
+      if shard_symbol == 'alone_shard'
+        ['mmorpg_players', 'weapons', 'skills'].each do |table|
+          BlankModel.using(shard_symbol).connection.execute("DELETE FROM #{table}")
         end
       end
     end