ar-octopus 0.8.1 → 0.10.2

data/spec/octopus/collection_proxy_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Octopus::CollectionProxy do
+  describe 'method dispatch' do
+    before :each do
+      @client = Client.using(:canada).create!
+      @client.items << Item.using(:canada).create!
+    end
+
+    it 'computes the size of the collection without loading it' do
+      expect(@client.items.size).to eq(1)
+
+      expect(@client.items.loaded?).to be false
+    end
+  end
+end

data/spec/octopus/load_balancing/round_robin_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Octopus::LoadBalancing::RoundRobin do
+  it "raises an error when no shards are given" do
+    expect do
+      Octopus::LoadBalancing::RoundRobin.new([])
+    end.to raise_error Octopus::Exception
+  end
+
+  it "does not raise an error if slaves given" do
+    expect do
+      Octopus::LoadBalancing::RoundRobin.new([:stub])
+    end.to_not raise_error Octopus::Exception
+  end
+end

data/spec/octopus/log_subscriber_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Octopus::LogSubscriber, :shards => [:canada] do
   before :each do
@@ -9,11 +9,11 @@ describe Octopus::LogSubscriber, :shards => [:canada] do
   end
 
   after :each do
-    ActiveRecord::Base.logger = nil
+    ActiveRecord::Base.logger = Logger.new(File.open('database.log', 'a'))
   end
 
-  it "should add to the default logger the shard name the query was sent to" do
-    User.using(:canada).create!(:name => "test")
-    @out.string.should =~ /Shard: canada/
+  it 'should add to the default logger the shard name the query was sent to' do
+    User.using(:canada).create!(:name => 'test')
+    expect(@out.string).to match(/Shard: canada/)
   end
 end

data/spec/octopus/migration_spec.rb

@@ -1,115 +1,149 @@
-require "spec_helper"
+require 'spec_helper'
+
+def get_all_versions
+  if Octopus.atleast_rails52?
+    migrations_root = File.expand_path(File.join(File.dirname(__FILE__), '..', 'migrations'))
+    ActiveRecord::MigrationContext.new(migrations_root).get_all_versions
+  else
+    ActiveRecord::Migrator.get_all_versions
+  end
+end
 
 describe Octopus::Migration do
-  it "should run just in the master shard" do
+  it 'should run just in the master shard' do
     OctopusHelper.migrating_to_version 1 do
-      User.using(:master).find_by_name("Master").should_not be_nil
-      User.using(:canada).find_by_name("Master").should be_nil
+      expect(User.using(:master).find_by_name('Master')).not_to be_nil
+      expect(User.using(:canada).find_by_name('Master')).to be_nil
     end
   end
 
-  it "should run on specific shard" do
+  it 'should run on specific shard' do
     OctopusHelper.migrating_to_version 2 do
-      User.using(:master).find_by_name("Sharding").should be_nil
-      User.using(:canada).find_by_name("Sharding").should_not be_nil
+      expect(User.using(:master).find_by_name('Sharding')).to be_nil
+      expect(User.using(:canada).find_by_name('Sharding')).not_to be_nil
     end
   end
 
-  it "should run on specifieds shards" do
+  it 'should run on specifieds shards' do
     OctopusHelper.migrating_to_version 3 do
-      User.using(:brazil).find_by_name("Both").should_not be_nil
-      User.using(:canada).find_by_name("Both").should_not be_nil
+      expect(User.using(:brazil).find_by_name('Both')).not_to be_nil
+      expect(User.using(:canada).find_by_name('Both')).not_to be_nil
     end
   end
 
-  it "should run on specified group" do
+  it 'should run on specified group' do
     OctopusHelper.migrating_to_version 4 do
-      User.using(:canada).find_by_name("Group").should_not be_nil
-      User.using(:brazil).find_by_name("Group").should_not be_nil
-      User.using(:russia).find_by_name("Group").should_not be_nil
+      expect(User.using(:canada).find_by_name('Group')).not_to be_nil
+      expect(User.using(:brazil).find_by_name('Group')).not_to be_nil
+      expect(User.using(:russia).find_by_name('Group')).not_to be_nil
+    end
+  end
+
+  it "should rollback correctly migrations" do
+    migrations_root = File.expand_path(File.join(File.dirname(__FILE__), '..', 'migrations'))
+    if Octopus.atleast_rails52?
+      OctopusHelper.migrate_to_version(:up, migrations_root, 4)
+    else
+      ActiveRecord::Migrator.run(:up, migrations_root, 4)
+    end
+
+    expect(User.using(:canada).find_by_name('Group')).not_to be_nil
+    expect(User.using(:brazil).find_by_name('Group')).not_to be_nil
+    expect(User.using(:russia).find_by_name('Group')).not_to be_nil
+
+
+    Octopus.using(:canada) do
+      if Octopus.atleast_rails52?
+        OctopusHelper.migrate_to_version(:down, migrations_root, 4)
+      else
+        ActiveRecord::Migrator.rollback(migrations_root, 4)
+      end
     end
+
+    expect(User.using(:canada).find_by_name('Group')).to be_nil
+    expect(User.using(:brazil).find_by_name('Group')).to be_nil
+    expect(User.using(:russia).find_by_name('Group')).to be_nil
   end
 
-  it "should run once per shard" do
+  it 'should run once per shard' do
     OctopusHelper.migrating_to_version 5 do
-      User.using(:canada).where(:name => 'MultipleGroup').size.should == 1
-      User.using(:brazil).where(:name => 'MultipleGroup').size.should == 1
-      User.using(:russia).where(:name => 'MultipleGroup').size.should == 1
+      expect(User.using(:canada).where(:name => 'MultipleGroup').size).to eq(1)
+      expect(User.using(:brazil).where(:name => 'MultipleGroup').size).to eq(1)
+      expect(User.using(:russia).where(:name => 'MultipleGroup').size).to eq(1)
     end
   end
 
-  it "should create users inside block" do
+  it 'should create users inside block' do
     OctopusHelper.migrating_to_version 12 do
-      User.using(:brazil).where(:name => 'UsingBlock1').size.should == 1
-      User.using(:brazil).where(:name => 'UsingBlock2').size.should == 1
-      User.using(:canada).where(:name => 'UsingCanada').size.should == 1
-      User.using(:canada).where(:name => 'UsingCanada2').size.should == 1
+      expect(User.using(:brazil).where(:name => 'UsingBlock1').size).to eq(1)
+      expect(User.using(:brazil).where(:name => 'UsingBlock2').size).to eq(1)
+      expect(User.using(:canada).where(:name => 'UsingCanada').size).to eq(1)
+      expect(User.using(:canada).where(:name => 'UsingCanada2').size).to eq(1)
     end
   end
 
-  it "should send the query to the correct shard" do
+  it 'should send the query to the correct shard' do
     OctopusHelper.migrating_to_version 13 do
-      User.using(:brazil).where(:name => 'Brazil').size.should == 1
-      User.using(:brazil).where(:name => 'Canada').size.should == 0
-      User.using(:canada).where(:name => 'Brazil').size.should == 0
-      User.using(:canada).where(:name => 'Canada').size.should == 1
+      expect(User.using(:brazil).where(:name => 'Brazil').size).to eq(1)
+      expect(User.using(:brazil).where(:name => 'Canada').size).to eq(0)
+      expect(User.using(:canada).where(:name => 'Brazil').size).to eq(0)
+      expect(User.using(:canada).where(:name => 'Canada').size).to eq(1)
     end
   end
 
-  describe "when using replication" do
-    it "should run writes on master when you use replication" do
+  describe 'when using replication' do
+    it 'should run writes on master when you use replication' do
       OctopusHelper.using_environment :production_replicated do
         OctopusHelper.migrating_to_version 10 do
-          Cat.find_by_name("Replication").should be_nil
+          expect(Cat.find_by_name('Replication')).to be_nil
         end
       end
     end
 
-    it "should run in all shards, master or another shards" do
+    it 'should run in all shards, master or another shards' do
       OctopusHelper.using_environment :production_replicated do
         OctopusHelper.migrating_to_version 11 do
-          [:slave4, :slave1, :slave2, :slave3].each do |sym|
-            Cat.find_by_name("Slaves").should_not be_nil
+          [:slave4, :slave1, :slave2, :slave3].each do |_sym|
+            expect(Cat.find_by_name('Slaves')).not_to be_nil
           end
         end
       end
     end
   end
 
-  it "should store the migration versions in each shard" do
+  it 'should store the migration versions in each shard' do
     class SchemaMigration < ActiveRecord::Base; end
 
     OctopusHelper.migrating_to_version 14 do
-      Octopus.using(:canada) { ActiveRecord::Migrator.get_all_versions }.should include(14)
-      Octopus.using(:brazil) { ActiveRecord::Migrator.get_all_versions }.should include(14)
-      Octopus.using(:russia) { ActiveRecord::Migrator.get_all_versions }.should include(14)
+      expect(Octopus.using(:canada) { get_all_versions }).to include(14)
+      expect(Octopus.using(:brazil) { get_all_versions }).to include(14)
+      expect(Octopus.using(:russia) { get_all_versions }).to include(14)
     end
   end
 
-  it "should run the migrations on shards that are missing them" do
+  it 'should run the migrations on shards that are missing them' do
     class SchemaMigration < ActiveRecord::Base; end
 
     Octopus.using(:master) { SchemaMigration.create(:version => 14) }
     Octopus.using(:canada) { SchemaMigration.create(:version => 14) }
 
     OctopusHelper.migrating_to_version 14 do
-      Octopus.using(:canada) { ActiveRecord::Migrator.get_all_versions }.should include(14)
-      Octopus.using(:brazil) { ActiveRecord::Migrator.get_all_versions }.should include(14)
-      Octopus.using(:russia) { ActiveRecord::Migrator.get_all_versions }.should include(14)
+      expect(Octopus.using(:canada) { get_all_versions }).to include(14)
+      expect(Octopus.using(:brazil) { get_all_versions }).to include(14)
+      expect(Octopus.using(:russia) { get_all_versions }).to include(14)
     end
   end
 
-  describe "when using a default_migration_group" do
-    it "should run migrations on all shards in the default_migration_group" do
+  describe 'when using a default_migration_group' do
+    it 'should run migrations on all shards in the default_migration_group' do
       OctopusHelper.using_environment :octopus_with_default_migration_group do
         OctopusHelper.migrating_to_version 15 do
-          Octopus.using(:master) { ActiveRecord::Migrator.get_all_versions }.should_not include(15)
-          Octopus.using(:canada) { ActiveRecord::Migrator.get_all_versions }.should include(15)
-          Octopus.using(:brazil) { ActiveRecord::Migrator.get_all_versions }.should include(15)
-          Octopus.using(:russia) { ActiveRecord::Migrator.get_all_versions }.should include(15)
+          expect(Octopus.using(:master) { get_all_versions }).not_to include(15)
+          expect(Octopus.using(:canada) { get_all_versions }).to include(15)
+          expect(Octopus.using(:brazil) { get_all_versions }).to include(15)
+          expect(Octopus.using(:russia) { get_all_versions }).to include(15)
         end
       end
     end
   end
-
 end