Upgrade to RSpec 3

Author: laserlemon

Gemfile

@@ -12,6 +12,6 @@ group :test do
   gem "dm-migrations", "~> 1.2"
   gem "dm-sqlite-adapter", "~> 1.2"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
   gem "sqlite3", "~> 1.3"
 end

gemfiles/active_record/3-0.gemfile

@@ -7,6 +7,6 @@ gemspec name: "periscope-activerecord", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
   gem "sqlite3", "~> 1.3"
 end

gemfiles/active_record/3-1.gemfile

@@ -7,6 +7,6 @@ gemspec name: "periscope-activerecord", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
   gem "sqlite3", "~> 1.3"
 end

gemfiles/active_record/3-2.gemfile

@@ -7,6 +7,6 @@ gemspec name: "periscope-activerecord", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
   gem "sqlite3", "~> 1.3"
 end

gemfiles/active_record/4-0.gemfile

@@ -7,6 +7,6 @@ gemspec name: "periscope-activerecord", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
   gem "sqlite3", "~> 1.3"
 end

gemfiles/active_record/4-1.gemfile

@@ -7,6 +7,6 @@ gemspec name: "periscope-activerecord", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
   gem "sqlite3", "~> 1.3"
 end

gemfiles/data_mapper/1-0.gemfile

@@ -9,6 +9,6 @@ group :test do
   gem "dm-migrations", "~> 1.0.0"
   gem "dm-sqlite-adapter", "~> 1.0.0"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
   gem "sqlite3", "~> 1.3"
 end

gemfiles/data_mapper/1-1.gemfile

@@ -9,6 +9,6 @@ group :test do
   gem "dm-migrations", "~> 1.1.0"
   gem "dm-sqlite-adapter", "~> 1.1.0"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
   gem "sqlite3", "~> 1.3"
 end

gemfiles/data_mapper/1-2.gemfile

@@ -9,6 +9,6 @@ group :test do
   gem "dm-migrations", "~> 1.2.0"
   gem "dm-sqlite-adapter", "~> 1.2.0"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
   gem "sqlite3", "~> 1.3"
 end

gemfiles/mongo_mapper/0-10.gemfile

@@ -8,5 +8,5 @@ group :test do
   gem "bson_ext", "~> 1.10"
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongo_mapper/0-11.gemfile

@@ -8,5 +8,5 @@ group :test do
   gem "bson_ext", "~> 1.10"
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongo_mapper/0-12.gemfile

@@ -8,5 +8,5 @@ group :test do
   gem "bson_ext", "~> 1.10"
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongo_mapper/0-13.gemfile

@@ -8,5 +8,5 @@ group :test do
   gem "bson_ext", "~> 1.10"
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongo_mapper/0-9.gemfile

@@ -8,5 +8,5 @@ group :test do
   gem "bson_ext", "~> 1.10"
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/2-0.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/2-1.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/2-2.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/2-3.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/2-4.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/2-5.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/2-6.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/2-7.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/2-8.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/3-0.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/3-1.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

gemfiles/mongoid/4-0.gemfile

@@ -7,5 +7,5 @@ gemspec name: "periscope-mongoid", path: "../../"
 group :test do
   gem "database_cleaner", "~> 1.3"
   gem "factory_girl", "~> 4.4"
-  gem "rspec", "~> 2.14"
+  gem "rspec", "~> 3.0"
 end

spec/shared/databasic.rb

@@ -7,31 +7,31 @@
     end
 
     it "returns all records for no params" do
-      User.periscope.count.should == 3
+      expect(User.periscope.count).to eq(3)
     end
 
     it "respects existing scoping" do
-      User.female.periscope.count.should == 2
+      expect(User.female.periscope.count).to eq(2)
     end
 
     it "links to existing scoping" do
       User.scope_accessible(:makes)
-      User.female.periscope(makes: 3_000_000).count.should == 1
+      expect(User.female.periscope(makes: 3_000_000).count).to eq(1)
     end
 
     it "applies named scopes" do
       User.scope_accessible(:male, boolean: true)
-      User.periscope(male: true).count.should == 1
+      expect(User.periscope(male: true).count).to eq(1)
     end
 
     it "applies class methods" do
       User.scope_accessible(:gender)
-      User.periscope(gender: "male").count.should == 1
+      expect(User.periscope(gender: "male").count).to eq(1)
     end
 
     it "chains scopes" do
       User.scope_accessible(:gender, :makes)
-      User.periscope(gender: "female", makes: 3_000_000).count.should == 1
+      expect(User.periscope(gender: "female", makes: 3_000_000).count).to eq(1)
     end
   end
 end

spec/shared/periscopic.rb

@@ -1,29 +1,30 @@
 shared_examples "periscopic" do
   context "without a database" do
     before do
-      model.stub(periscope_default_scope: model)
+      allow(model).to receive(:periscope_default_scope).and_return(model)
     end
 
     def expect_scopes(calls)
       calls.each do |method, args|
-        model.should_receive(method).with(*args).and_return(model)
+        args << no_args if args.empty?
+        expect(model).to receive(method).with(*args).and_return(model)
       end
     end
 
     it "uses the default scope for no params" do
       scoped = double(:scoped).as_null_object
-      model.should_receive(:periscope_default_scope).once.and_return(scoped)
-      model.periscope.should == scoped
+      expect(model).to receive(:periscope_default_scope).once.and_return(scoped)
+      expect(model.periscope).to eq(scoped)
     end
 
     it "uses the default scope for empty params" do
       scoped = double(:scoped).as_null_object
-      model.should_receive(:periscope_default_scope).once.and_return(scoped)
-      model.periscope({}).should == scoped
+      expect(model).to receive(:periscope_default_scope).once.and_return(scoped)
+      expect(model.periscope({})).to eq(scoped)
     end
 
     it "ignores protected scopes" do
-      model.should_not_receive(:foo)
+      expect(model).not_to receive(:foo)
       model.periscope(foo: "bar")
     end
 
@@ -41,7 +42,7 @@ def expect_scopes(calls)
 
     it "ignores protected scopes when mixed with accessible scopes" do
       expect_scopes(foo: ["baz"])
-      model.should_not_receive(:bar)
+      expect(model).not_to receive(:bar)
       model.scope_accessible(:foo)
       model.periscope(foo: "baz", bar: "mitzvah")
     end
@@ -94,7 +95,7 @@ def expect_scopes(calls)
     it "allows custom parameter parsing via custom parser" do
       expect_scopes(foo: ["BAR"])
       parser = double(:parser).as_null_object
-      parser.should_receive(:call).once.with("bar").and_return(["BAR"])
+      expect(parser).to receive(:call).once.with("bar").and_return(["BAR"])
       model.scope_accessible(:foo, parser: parser)
       model.periscope(foo: "bar")
     end
@@ -106,19 +107,19 @@ def expect_scopes(calls)
     end
 
     it "allows accessible scope exclusion given a falsey param" do
-      model.should_not_receive(:foo)
+      expect(model).not_to receive(:foo)
       model.scope_accessible(:foo, boolean: true)
       model.periscope(foo: nil)
     end
 
     it "allows accessible scope exclusion given a falsey parsed value" do
-      model.should_not_receive(:foo)
+      expect(model).not_to receive(:foo)
       model.scope_accessible(:foo, boolean: true, parser: proc { [nil] })
       model.periscope(foo: "bar")
     end
 
     it "allows accessible scope exclusion given a blank param" do
-      model.should_not_receive(:foo)
+      expect(model).not_to receive(:foo)
       model.scope_accessible(:foo, ignore_blank: true)
       model.periscope(foo: nil)
       model.periscope(foo: "")
@@ -133,7 +134,7 @@ def expect_scopes(calls)
     end
 
     it "allows accessible boolean scope exclusion given a blank param" do
-      model.should_not_receive(:foo)
+      expect(model).not_to receive(:foo)
       model.scope_accessible(:foo, boolean: true, ignore_blank: true)
       model.periscope(foo: nil)
       model.periscope(foo: "")