partitioned 1.3.4 → 1.3.5

data/spec/partitioned/partitioned_base/configurator/reader_spec.rb

@@ -24,7 +24,7 @@ module Partitioned
         let!(:default_reader) { Partitioned::PartitionedBase::Configurator::Reader.new(Employee) }
         let!(:reader) do
           reader = Partitioned::PartitionedBase::Configurator::Reader.new(Employee)
-          reader.stub!(:configurators).and_return([dsl])
+          allow(reader).to receive(:configurators).and_return([dsl])
           reader
         end
 
@@ -33,7 +33,7 @@ module Partitioned
           context "checking arrays length" do
 
             it "returns 3" do
-              default_reader.send(:configurators).length.should == 3
+              expect(default_reader.send(:configurators).length).to eq(3)
             end
 
           end # checking array length
@@ -41,15 +41,15 @@ module Partitioned
           context "checking models class for each of configurators" do
 
             it "returns 'Partitioned::ById'" do
-              default_reader.send(:configurators)[0].model.to_s.should == "Partitioned::ById"
+              expect(default_reader.send(:configurators)[0].model.to_s).to eq("Partitioned::ById")
             end
 
             it "returns 'Partitioned::ByIntegerField'" do
-              default_reader.send(:configurators)[1].model.to_s.should == "Partitioned::ByIntegerField"
+              expect(default_reader.send(:configurators)[1].model.to_s).to eq("Partitioned::ByIntegerField")
             end
 
             it "returns 'Partitioned::PartitionedBase'" do
-              default_reader.send(:configurators)[2].model.to_s.should == "Partitioned::PartitionedBase"
+              expect(default_reader.send(:configurators)[2].model.to_s).to eq("Partitioned::PartitionedBase")
             end
 
           end # checking models class for each of configurators
@@ -61,7 +61,7 @@ module Partitioned
           context "when schema_name value is set by default" do
 
             it "returns 'employees_partitions'" do
-              default_reader.schema_name.should == "employees_partitions"
+              expect(default_reader.schema_name).to eq("employees_partitions")
             end
 
           end # when schema_name value is set by default
@@ -70,7 +70,7 @@ module Partitioned
 
             it "returns 'employees_partitions'" do
               dsl.schema_name("employees_partitions")
-              reader.schema_name.should == "employees_partitions"
+              expect(reader.schema_name).to eq("employees_partitions")
             end
 
           end # when schema_name value is set by value
@@ -79,7 +79,7 @@ module Partitioned
 
             it "returns 'employees_partitions'" do
               dsl.schema_name('#{model.table_name}_partitions')
-              reader.schema_name.should == "employees_partitions"
+              expect(reader.schema_name).to eq("employees_partitions")
             end
 
           end # when schema_name value is set by string
@@ -94,7 +94,7 @@ module Partitioned
 
             it "returns 'employees_partitions'" do
               dsl.schema_name lmd
-              reader.schema_name.should == "employees_partitions"
+              expect(reader.schema_name).to eq("employees_partitions")
             end
 
           end # when schema_name value is set by proc
@@ -106,7 +106,7 @@ module Partitioned
           context "when on_field value is set by default" do
 
             it "returns [:id]" do
-              default_reader.on_fields.should == [:id]
+              expect(default_reader.on_fields).to eq([:id])
             end
 
           end # when on_filed value is set by default
@@ -115,7 +115,7 @@ module Partitioned
 
             it "returns [:company_id]" do
               dsl.on :company_id
-              reader.on_fields.should == [:company_id]
+              expect(reader.on_fields).to eq([:company_id])
             end
 
           end # "when on_field value is set by symbol
@@ -124,7 +124,7 @@ module Partitioned
 
             it "returns [:id]" do
               dsl.on '#{model.partition_field}'
-              reader.on_fields.should == [:id]
+              expect(reader.on_fields).to eq([:id])
             end
 
           end # "when on_field value is set by string
@@ -137,7 +137,7 @@ module Partitioned
 
             it "returns [:id]" do
               dsl.on lmd
-              reader.on_fields.should == [:id]
+              expect(reader.on_fields).to eq([:id])
             end
 
           end # "when on_field value is set by proc
@@ -149,7 +149,7 @@ module Partitioned
           context "when indexes value is set by default" do
 
             it "returns { :id => { :unique => true } }" do
-              default_reader.indexes.should == { :id => { :unique => true } }
+              expect(default_reader.indexes).to eq({ :id => { :unique => true } })
             end
 
           end # when indexes value is set by default
@@ -158,7 +158,7 @@ module Partitioned
 
             it "returns { :id => { :unique => false } }" do
               dsl.index(:id, { :unique => false })
-              reader.indexes.should == { :id => { :unique => false } }
+              expect(reader.indexes).to eq({ :id => { :unique => false } })
             end
 
           end # when indexes value is set by values
@@ -173,7 +173,7 @@ module Partitioned
 
             it "returns { :id => {} }" do
               dsl.index lmd
-              reader.indexes.should == { :id => {} }
+              expect(reader.indexes).to eq({ :id => {} })
             end
 
           end # when indexes value is set by proc
@@ -186,9 +186,9 @@ module Partitioned
 
             it "returns foreign_keys" do
               dsl.foreign_key(:company_id)
-              reader.foreign_keys.first.referenced_field.should == :id
-              reader.foreign_keys.first.referenced_table.should == "companies"
-              reader.foreign_keys.first.referencing_field.should == :company_id
+              expect(reader.foreign_keys.first.referenced_field).to eq(:id)
+              expect(reader.foreign_keys.first.referenced_table).to eq("companies")
+              expect(reader.foreign_keys.first.referencing_field).to eq(:company_id)
             end
 
           end # when foreign_keys value is set by symbol
@@ -203,9 +203,9 @@ module Partitioned
 
             it "returns foreign_keys" do
               dsl.foreign_key lmd
-              reader.foreign_keys.first.referenced_field.should == :id
-              reader.foreign_keys.first.referenced_table.should == "companies"
-              reader.foreign_keys.first.referencing_field.should == :company_id
+              expect(reader.foreign_keys.first.referenced_field).to eq(:id)
+              expect(reader.foreign_keys.first.referenced_table).to eq("companies")
+              expect(reader.foreign_keys.first.referencing_field).to eq(:company_id)
             end
 
           end # when foreign_keys value is set by proc
@@ -218,7 +218,7 @@ module Partitioned
 
             it "returns 'company_id = 1'" do
               dsl.check_constraint('company_id = #{field_value}')
-              reader.check_constraint(1).should == "company_id = 1"
+              expect(reader.check_constraint(1)).to eq("company_id = 1")
             end
 
           end # when check_constraint value is set by string
@@ -233,7 +233,7 @@ module Partitioned
 
             it "returns 'id = 1'" do
               dsl.check_constraint lmd
-              reader.check_constraint(1).should == "id = 1"
+              expect(reader.check_constraint(1)).to eq("id = 1")
             end
 
           end # when check_constraint value is set by proc
@@ -245,7 +245,7 @@ module Partitioned
           context "when parent_table_name value is set by default" do
 
             it "returns employees" do
-              default_reader.parent_table_name.should == "employees"
+              expect(default_reader.parent_table_name).to eq("employees")
             end
 
           end # when parent_table_name value is set by default
@@ -254,7 +254,7 @@ module Partitioned
 
             it "returns employees" do
               dsl.parent_table_name("employees")
-              reader.parent_table_name.should == "employees"
+              expect(reader.parent_table_name).to eq("employees")
             end
 
           end # when parent_table_name value is set by value
@@ -263,7 +263,7 @@ module Partitioned
 
             it "returns employees" do
               dsl.parent_table_name('#{model.table_name}')
-              reader.parent_table_name.should == "employees"
+              expect(reader.parent_table_name).to eq("employees")
             end
 
           end # when parent_table_name value is set by string
@@ -278,7 +278,7 @@ module Partitioned
 
             it "returns employees" do
               dsl.parent_table_name lmd
-              reader.parent_table_name.should == "employees"
+              expect(reader.parent_table_name).to eq("employees")
             end
 
           end # when parent_table_name value is set by proc
@@ -290,7 +290,7 @@ module Partitioned
           context "when parent_table_schema_name value is set by default" do
 
             it "returns public" do
-              default_reader.parent_table_schema_name.should == "public"
+              expect(default_reader.parent_table_schema_name).to eq("public")
             end
 
           end # when parent_table_schema_name value is set by default
@@ -299,7 +299,7 @@ module Partitioned
 
             it "returns employees" do
               dsl.parent_table_schema_name("employees")
-              reader.parent_table_schema_name.should == "employees"
+              expect(reader.parent_table_schema_name).to eq("employees")
             end
 
           end # when parent_table_schema_name value is set by value
@@ -308,7 +308,7 @@ module Partitioned
 
             it "returns employees" do
               dsl.parent_table_schema_name('#{model.table_name}')
-              reader.parent_table_schema_name.should == "employees"
+              expect(reader.parent_table_schema_name).to eq("employees")
             end
 
           end # when parent_table_schema_name value is set by string
@@ -323,7 +323,7 @@ module Partitioned
 
             it "returns employees" do
               dsl.parent_table_schema_name lmd
-              reader.parent_table_schema_name.should == "employees"
+              expect(reader.parent_table_schema_name).to eq("employees")
             end
 
           end # when parent_table_schema_name value is set by proc
@@ -335,7 +335,7 @@ module Partitioned
           context "when table_name value is set by default" do
 
             it "returns employees_partitions.p10000000" do
-              default_reader.table_name(10000000).should == "employees_partitions.p10000000"
+              expect(default_reader.table_name(10000000)).to eq("employees_partitions.p10000000")
             end
 
           end # when table_name value is set by default
@@ -344,7 +344,7 @@ module Partitioned
 
             it "returns employees_partitions.p42" do
               dsl.table_name("employees_partitions.p42")
-              reader.table_name.should == "employees_partitions.p42"
+              expect(reader.table_name(57)).to eq("employees_partitions.p42")
             end
 
           end # when table_name value is set by value
@@ -353,7 +353,7 @@ module Partitioned
 
             it "returns employees_partitions.employees_child_10000000" do
               dsl.table_name('#{model.table_name}_partitions.#{model.table_name}_child_#{model.partition_normalize_key_value(field_value)}')
-              reader.table_name(10000000).should == "employees_partitions.employees_child_10000000"
+              expect(reader.table_name(10000000)).to eq("employees_partitions.employees_child_10000000")
             end
 
           end # when table_name value is set by string
@@ -368,7 +368,7 @@ module Partitioned
 
             it "returns employees_partitions.employees_child_10000000" do
               dsl.table_name lmd
-              reader.table_name(10000000).should == "employees_partitions.employees_child_10000000"
+              expect(reader.table_name(10000000)).to eq("employees_partitions.employees_child_10000000")
             end
 
           end # when table_name value is set by proc
@@ -381,7 +381,7 @@ module Partitioned
 
             it "returns 42" do
               dsl.base_name("42")
-              reader.base_name.should == "42"
+              expect(reader.base_name).to eq("42")
             end
 
           end # when base_name value is set by value
@@ -390,7 +390,7 @@ module Partitioned
 
             it "returns 10000000" do
               dsl.base_name('#{model.partition_normalize_key_value(field_value)}')
-              reader.base_name(10000000).should == "10000000"
+              expect(reader.base_name(10000000)).to eq("10000000")
             end
 
           end # when base_name value is set by string
@@ -405,7 +405,7 @@ module Partitioned
 
             it "returns 10000000" do
               dsl.base_name lmd
-              reader.base_name(10000000).should == "10000000"
+              expect(reader.base_name(10000000)).to eq("10000000")
             end
 
           end # when base_name value is set by proc
@@ -417,7 +417,7 @@ module Partitioned
           context "when name_prefix value is set by default" do
 
             it "returns 'p'" do
-              default_reader.name_prefix.should == "p"
+              expect(default_reader.name_prefix).to eq("p")
             end
 
           end # when name_prefix value is set by default
@@ -426,7 +426,7 @@ module Partitioned
 
             it "returns 'p'" do
               dsl.name_prefix("p")
-              reader.name_prefix.should == "p"
+              expect(reader.name_prefix).to eq("p")
             end
 
           end # when name_prefix value is set by value
@@ -435,7 +435,7 @@ module Partitioned
 
             it "returns 'employees_child_'" do
               dsl.name_prefix('#{model.table_name}_child_')
-              reader.name_prefix.should == "employees_child_"
+              expect(reader.name_prefix).to eq("employees_child_")
             end
 
           end # when name_prefix value is set by string
@@ -450,7 +450,7 @@ module Partitioned
 
             it "returns 'employees_child_'" do
               dsl.name_prefix lmd
-              reader.name_prefix.should == "employees_child_"
+              expect(reader.name_prefix).to eq("employees_child_")
             end
 
           end # when name_prefix value is set by proc
@@ -463,7 +463,7 @@ module Partitioned
 
             it "returns 'p42'" do
               dsl.part_name("p42")
-              reader.part_name.should == "p42"
+              expect(reader.part_name).to eq("p42")
             end
 
           end # when part_name value is set by value
@@ -472,7 +472,7 @@ module Partitioned
 
             it "returns 'employees_child_10000000'" do
               dsl.part_name('#{model.table_name}_child_#{model.partition_normalize_key_value(field_value)}')
-              reader.part_name(10000000).should == "employees_child_10000000"
+              expect(reader.part_name(10000000)).to eq("employees_child_10000000")
             end
 
           end # when part_name value is set by string
@@ -487,7 +487,7 @@ module Partitioned
 
             it "returns 'employees_child_10000000'" do
               dsl.part_name lmd
-              reader.part_name(10000000).should == "employees_child_10000000"
+              expect(reader.part_name(10000000)).to eq("employees_child_10000000")
             end
 
           end # when part_name value is set by proc
@@ -500,7 +500,7 @@ module Partitioned
 
             it "returns 'tablename desc'" do
               dsl.order('tablename desc')
-              reader.last_partitions_order_by_clause.should == "tablename desc"
+              expect(reader.last_partitions_order_by_clause).to eq("tablename desc")
             end
 
           end # when order value is set by value
@@ -510,4 +510,4 @@ module Partitioned
       end # Reader
     end # Configurator
   end # PartitionedBase
-end # Partitioned
+end # Partitioned

data/spec/partitioned/partitioned_base/sql_adapter_spec.rb

@@ -90,14 +90,14 @@ module Partitioned
             WHERE specific_schema NOT IN ('pg_catalog', 'information_schema')
             AND type_udt_name != 'trigger';
           SQL
-          result.values.first.should == ["always_fail_on_insert"]
+          expect(result.values.first).to eq ["always_fail_on_insert"]
         end
       end # ensure_always_fail_on_insert_exists
 
       describe "create_partition_schema" do
         it "created schema" do
           sql_adapter.create_partition_schema
-          check_existence_schema.values.should_not be_blank
+          expect(check_existence_schema.values).not_to be_blank
         end
       end # create_partition_schema
 
@@ -105,7 +105,7 @@ module Partitioned
 
         context "when partition table don't exist" do
           it "returns false" do
-            sql_adapter.partition_exists?(1).should be_false
+            expect(sql_adapter.partition_exists?(1)).to be false
           end
         end # when partition table don't exist
 
@@ -113,7 +113,7 @@ module Partitioned
           it "returns true" do
             create_new_schema
             create_new_partition_table
-            sql_adapter.partition_exists?(1).should be_true
+            expect(sql_adapter.partition_exists?(1)).to be true
           end
         end # when partition table exist
       end # partition_exists?
@@ -122,7 +122,7 @@ module Partitioned
 
         context "when partition table don't exist" do
           it "returns empty array" do
-            sql_adapter.last_n_partition_names.should == []
+            expect(sql_adapter.last_n_partition_names).to be_empty
           end
         end # when partition table don't exist
 
@@ -130,7 +130,7 @@ module Partitioned
           it "returns partition table name" do
             create_new_schema
             create_new_partition_table
-            sql_adapter.last_n_partition_names.should == ["p1"]
+            expect(sql_adapter.last_n_partition_names).to eq ["p1"]
           end
         end # when partition table exist
       end
@@ -139,10 +139,10 @@ module Partitioned
         context "when try to insert row into table with rules" do
           it "raises ActiveRecord::StatementInvalid" do
             sql_adapter.add_parent_table_rules
-            lambda { ActiveRecord::Base.connection.execute <<-SQL
+            expect(lambda { ActiveRecord::Base.connection.execute <<-SQL
                 insert into employee (name) values ('name');
               SQL
-            }.should raise_error(ActiveRecord::StatementInvalid)
+            }).to raise_error(ActiveRecord::StatementInvalid)
           end
         end # when try to insert row into table with rules
       end # add_parent_table_rules
@@ -150,10 +150,10 @@ module Partitioned
       describe "create_partition_table" do
         it "created partition table" do
           create_new_schema
-          lambda {
+          expect(lambda {
             sql_adapter.create_partition_table(1)
-          }.should_not raise_error
-          check_existence_table.values.sort.should == [["employees"], ["p1"]].sort
+          }).not_to raise_error
+          expect(check_existence_table.values.sort).to eq [["employees"], ["p1"]].sort
         end
       end # create_partition_table
 
@@ -162,7 +162,7 @@ module Partitioned
           create_new_schema
           sql_adapter.create_partition_table(1)
           sql_adapter.drop_partition_table(1)
-          check_existence_table.values.should == [["employees"]]
+          expect(check_existence_table.values).to eq [["employees"]]
         end
       end # drop_partition_table
 
@@ -175,7 +175,7 @@ module Partitioned
             SELECT count(*) FROM pg_class
             where relname = 'p1_id_udx'
           SQL
-          result.values.should == [["1"]]
+          expect(result.values).to eq [["1"]]
         end
       end # add_partition_table_index
 
@@ -195,10 +195,10 @@ module Partitioned
             SELECT constraint_type FROM information_schema.table_constraints
             WHERE table_name = 'p1' AND constraint_name = 'p1_company_id_fkey';
           SQL
-          result.values.first.should == ["FOREIGN KEY"]
+          expect(result.values.first).to eq ["FOREIGN KEY"]
         end
       end # add_references_to_partition_table
 
     end # SqlAdapter
   end # PartitionedBase
-end # Partitioned
+end # Partitioned

data/spec/partitioned/partitioned_base_spec.rb

@@ -17,7 +17,7 @@ module Partitioned
     describe "model is abstract class" do
 
       it "returns true" do
-        class_partitioned_base.abstract_class.should be_true
+        expect(class_partitioned_base.abstract_class).to be_truthy
       end
 
     end # model is abstract class
@@ -31,7 +31,7 @@ module Partitioned
       context "checks data in the schema_name" do
 
         it "returns schema_name" do
-          data.schema_name.call(Employee).should == "employees_partitions"
+          expect(data.schema_name.call(Employee)).to eq("employees_partitions")
         end
 
       end # checks data in the schema_name
@@ -39,7 +39,7 @@ module Partitioned
       context "checks data in the parent_table_name" do
 
         it "returns parent_table_name" do
-          data.parent_table_name.call(Employee).should == "employees"
+          expect(data.parent_table_name.call(Employee)).to eq("employees")
         end
 
       end # checks data in the parent_table_name
@@ -47,7 +47,7 @@ module Partitioned
       context "checks data in the parent_table_schema_name" do
 
         it "returns parent_table_schema_name" do
-          data.parent_table_schema_name.call(Employee).should == "public"
+          expect(data.parent_table_schema_name.call(Employee)).to eq("public")
         end
 
       end # checks data in the parent_table_schema_name
@@ -55,7 +55,7 @@ module Partitioned
       context "checks data in the name_prefix" do
 
         it "returns name_prefix" do
-          data.name_prefix.call(Employee).should == "p"
+          expect(data.name_prefix.call(Employee)).to eq("p")
         end
 
       end # checks data in the name_prefix
@@ -63,7 +63,7 @@ module Partitioned
       context "checks data in the part_name" do
 
         it "returns part_name" do
-          data.part_name.call(Employee, 1).should == "p1"
+          expect(data.part_name.call(Employee, 1)).to eq("p1")
         end
 
       end # checks data in the part_name
@@ -71,7 +71,7 @@ module Partitioned
       context "checks data in the table_name" do
 
         it "returns table_name" do
-          data.table_name.call(Employee, 1).should == "employees_partitions.p1"
+          expect(data.table_name.call(Employee, 1)).to eq("employees_partitions.p1")
         end
 
       end # checks data in the table_name
@@ -79,7 +79,7 @@ module Partitioned
       context "checks data in the base_name" do
 
         it "returns base_name" do
-          data.base_name.call(Employee, 1).should == "1"
+          expect(data.base_name.call(Employee, 1)).to eq("1")
         end
 
       end # checks data in the base_name
@@ -88,13 +88,13 @@ module Partitioned
     context "#partition_key_values" do
 
       before do
-        class_partitioned_base.stub!(:partition_keys).and_return([:id])
+        allow(class_partitioned_base).to receive(:partition_keys).and_return([:id])
       end
 
       context "call method with key that represented as a string" do
 
         it "returns values" do
-          class_partitioned_base.partition_key_values( "id" => 1 ).should == [1]
+          expect(class_partitioned_base.partition_key_values( "id" => 1 )).to eq([1])
         end
 
       end # call method with key that represented as a string
@@ -102,7 +102,7 @@ module Partitioned
       context "call method with key that represented as a symbol" do
 
         it "returns values" do
-          class_partitioned_base.partition_key_values( :id => 2 ).should == [2]
+          expect(class_partitioned_base.partition_key_values( :id => 2 )).to eq([2])
         end
 
       end # call method with key that represented as a symbol
@@ -120,7 +120,7 @@ module Partitioned
             name             text not null
           );
         SQL
-        Employee.stub!(:partition_keys).and_return([:id])
+        allow(Employee).to receive(:partition_keys).and_return([:id])
         @employee = Employee.new
       end
 
@@ -129,8 +129,8 @@ module Partitioned
         context "call method with attributes key that represented as a string" do
 
           it "returns employees_partitions.p1" do
-            @employee.stub!(:attributes).and_return("id" => 1)
-            @employee.partition_table_name.should == "employees_partitions.p1"
+            allow(@employee).to receive(:attributes).and_return("id" => 1)
+            expect(@employee.partition_table_name).to eq("employees_partitions.p1")
           end
 
         end # call method with attributes key that represented as a string
@@ -138,8 +138,8 @@ module Partitioned
         context "call method with attributes key that represented as a symbol" do
 
           it "returns employees_partitions.p2" do
-            @employee.stub!(:attributes).and_return(:id => 2)
-            @employee.partition_table_name.should == "employees_partitions.p2"
+            allow(@employee).to receive(:attributes).and_return(:id => 2)
+            expect(@employee.partition_table_name).to eq("employees_partitions.p2")
           end
 
         end # call method with attributes key that represented as a symbol
@@ -151,8 +151,8 @@ module Partitioned
         context "call method with attributes key that represented as a string" do
 
           it "returns arel table name employees_partitions.p1" do
-            @employee.stub!(:attributes).and_return("id" => 1)
-            @employee.dynamic_arel_table.name.should == "employees_partitions.p1"
+            allow(@employee).to receive(:attributes).and_return("id" => 1)
+            expect(@employee.dynamic_arel_table.name).to eq("employees_partitions.p1")
           end
 
         end # call method with attributes key that represented as a string
@@ -160,8 +160,8 @@ module Partitioned
         context "call method with attributes key that represented as a symbol" do
 
           it "returns arel table name employees_partitions.p2" do
-            @employee.stub!(:attributes).and_return(:id => 2)
-            @employee.dynamic_arel_table.name.should == "employees_partitions.p2"
+            allow(@employee).to receive(:attributes).and_return(:id => 2)
+            expect(@employee.dynamic_arel_table.name).to eq("employees_partitions.p2")
           end
 
         end # call method with attributes key that represented as a symbol

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -29,4 +28,15 @@ RSpec.configure do |config|
   # automatically. This will be the default behavior in future versions of
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
+
+  # rspec-rails 3 will no longer automatically infer an example group's spec type
+  # from the file location. You can explicitly opt-in to the feature using this
+  # config option.
+  # To explicitly tag specs without using automatic inference, set the `:type`
+  # metadata manually:
+  #
+  #     describe ThingsController, :type => :controller do
+  #       # Equivalent to being in spec/controllers
+  #     end
+  config.infer_spec_type_from_file_location!
 end