Merge pull request eliotsykes#69 from leesmith/shoulda-matchers-3.0.0.rc1

Upgrade shoulda-matchers to 3.0.0.rc1

Author: eliotsykes

Gemfile

@@ -32,7 +32,7 @@ group :test do
   gem 'database_cleaner'
   gem 'email_spec'
   gem 'poltergeist' # helps with using PhantomJS headless browser in feature specs
-  gem 'shoulda-matchers', require: false
+  gem 'shoulda-matchers', '3.0.0.rc1'
   gem 'vcr'
   gem 'webmock'
 end

Gemfile.lock

@@ -211,8 +211,8 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    shoulda-matchers (2.7.0)
-      activesupport (>= 3.0.0)
+    shoulda-matchers (3.0.0.rc1)
+      activesupport (>= 4.0.0)
     slop (3.6.0)
     spring (1.2.0)
     spring-commands-rspec (1.0.4)
@@ -278,7 +278,7 @@ DEPENDENCIES
   rspec-rails (~> 3.2)
   sass-rails (~> 4.0)
   selenium-webdriver
-  shoulda-matchers
+  shoulda-matchers (= 3.0.0.rc1)
   spring
   spring-commands-rspec
   sqlite3
@@ -287,3 +287,6 @@ DEPENDENCIES
   vcr
   web-console (~> 2.0)
   webmock
+
+BUNDLED WITH
+   1.10.3

spec/models/subscription_spec.rb

@@ -11,11 +11,11 @@
     context "columns" do
       it { should have_db_column(:email).of_type(:string).with_options(limit: 100, null: false) }
       it { should have_db_column(:confirmation_token).of_type(:string).with_options(limit: 100, null: false) }
-      it { should have_db_column(:confirmed).of_type(:boolean).with_options(default: 'f', null: false) }
+      it { should have_db_column(:confirmed).of_type(:boolean).with_options(default: false, null: false) }
       it { should have_db_column(:start_on).of_type(:date) }
     end
   end
-  
+
   context "attributes" do
 
     it "has email" do
@@ -50,7 +50,7 @@
   end
 
   context "validation" do
-    
+
     before do
       @subscription = Subscription.new(confirmation_token: "token", email: "[email protected]")
     end
@@ -77,7 +77,7 @@
   end
 
   context "scopes" do
-    
+
     describe ".confirmation_overdue" do
 
       before do
@@ -86,7 +86,7 @@
       end
 
       after { travel_back }
-      
+
       it "returns unconfirmed subscriptions of age more than 3 days" do
         overdue = create(:subscription, confirmed: false, created_at: (3.days + 1.second).ago)
         expect(Subscription.confirmation_overdue).to match_array [overdue]
@@ -107,7 +107,7 @@
   end
 
   describe "#to_param" do
-    
+
     it "uses confirmation_token as the default identifier for routes" do
       subscription = Subscription.new(confirmation_token: "hello-im-a-token-123")
       expect(subscription.to_param).to eq("hello-im-a-token-123")
@@ -116,7 +116,7 @@
   end
 
   describe ".create_and_request_confirmation(params)" do
-    
+
     it "creates an unconfirmed subscription with the given params" do
       params = { email: "[email protected]", start_on: "2015-01-31" }
       Subscription.create_and_request_confirmation(params)
@@ -132,15 +132,15 @@
       expect(::SecureRandom).to receive(:hex).with(32).and_call_original
       subscription = Subscription.create_and_request_confirmation(email: "[email protected]")
       subscription.reload
-      
+
       expect(subscription.confirmation_token).to match(/\A[a-z0-9]{64}\z/)
     end
 
     it "emails a confirmation request" do
       expect(SubscriptionMailer)
         .to receive(:send_confirmation_request!)
         .with(Subscription)
-      
+
       Subscription.create_and_request_confirmation(email: "[email protected]")
     end
 
@@ -188,11 +188,11 @@
   end
 
   describe ".confirm(confirmation_token)" do
-    
+
     it "confirms the subscription matching the confirmation_token" do
       token = Subscription.generate_confirmation_token
       subscription = Subscription.create!(
-        email: "[email protected]", 
+        email: "[email protected]",
         confirmation_token: token
       )
       expect(subscription.confirmed?).to eq(false)
@@ -206,7 +206,7 @@
 
     it "gracefully handles confirming an already confirmed subscription" do
       subscription = Subscription.create!(
-        email: "[email protected]", 
+        email: "[email protected]",
         confirmation_token: "xyz"
       )
       expect(subscription.confirmed?).to eq(false)

spec/models/user_spec.rb

@@ -2,6 +2,9 @@
 
 RSpec.describe User, :type => :model do
 
-  it { should validate_uniqueness_of(:email) }
+  it { should validate_presence_of :email }
+  it { should validate_presence_of :password }
+  it { should validate_confirmation_of :password }
+  it { should validate_uniqueness_of(:email).case_insensitive }
 
 end

spec/rails_helper.rb

@@ -49,3 +49,20 @@
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 end
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    # Choose a test framework:
+    with.test_framework :rspec
+    # with.test_framework :minitest
+    # with.test_framework :minitest_4
+    # with.test_framework :test_unit
+
+    # Choose a library:
+    # with.library :active_record
+    # with.library :active_model
+    # with.library :action_controller
+    # Or, choose all of the above:
+    with.library :rails
+  end
+end