Merge pull request #91 from vinhnglx/use-factory-girl

Use factory girl

Author: eliotsykes

spec/controllers/subscriptions_controller_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe SubscriptionsController, :type => :controller do
 
   context "GET new" do
-    
+
     it "assigns a blank subscription to the view" do
       get :new
       expect(assigns(:subscription)).to be_a_new(Subscription)
@@ -12,7 +12,7 @@
   end
 
   context "POST create" do
-    
+
     it "redirects to pending subscriptions page" do
       params = { subscription: { email: "[email protected]", start_on: "2014-12-31" } }
       post :create, params
@@ -23,20 +23,28 @@
     it "calls Subscription.create_and_request_confirmation(params)" do
       email = "[email protected]"
       start_on = "2015-02-28"
-      
+
       expect(Subscription).to receive(:create_and_request_confirmation)
         .with({ email: email, start_on: start_on })
 
       post :create, { subscription: { email: email, start_on: start_on } }
     end
 
+    it "raises an error if missing params email" do
+      params = { subscription: { start_on: "2015-09-28" } }
+
+      expect do
+        post :create, params
+      end.to raise_error ActiveRecord::RecordInvalid
+    end
+
   end
 
   context "GET confirm" do
-    
+
     it "confirms the subscription" do
-      subscription = Subscription.create!(
-        email: "[email protected]", 
+      subscription = create(:subscription,
+        email: "[email protected]",
         confirmation_token: Subscription.generate_confirmation_token
       )
       expect(subscription.confirmed?).to eq(false)

spec/models/subscription_spec.rb

@@ -19,29 +19,29 @@
   context "attributes" do
 
     it "has email" do
-      expect(Subscription.new(email: "[email protected]")).to have_attributes(email: "[email protected]")
+      expect(build(:subscription, email: "[email protected]")).to have_attributes(email: "[email protected]")
     end
 
     it "has confirmed" do
-      expect(Subscription.new(confirmed: true)).to have_attributes(confirmed: true)
+      expect(build(:subscription, confirmed: true)).to have_attributes(confirmed: true)
     end
 
     it "has confirmation_token" do
-      expect(Subscription.new(confirmation_token: "what-a-token")).to have_attributes(confirmation_token: "what-a-token")
+      expect(build(:subscription, confirmation_token: "what-a-token")).to have_attributes(confirmation_token: "what-a-token")
     end
 
     context "start_on" do
 
       it "is an attribute" do
         today = Date.today
-        expect(Subscription.new(start_on: Date.today)).to have_attributes(start_on: today)
+        expect(build(:subscription, start_on: Date.today)).to have_attributes(start_on: today)
       end
 
       it "defaults to today" do
         now = Time.zone.now
         today = now.to_date
         travel_to now do
-          expect(Subscription.new.start_on).to eq(today)
+          expect(build(:subscription).start_on).to eq(today)
         end
       end
 
@@ -51,28 +51,26 @@
 
   context "validation" do
 
-    before do
-      @subscription = Subscription.new(confirmation_token: "token", email: "[email protected]")
-    end
+    let(:subscription) { build(:subscription, confirmation_token: "token", email: "[email protected]") }
 
     it "requires unique email" do
-      expect(@subscription).to validate_uniqueness_of(:email)
+      expect(subscription).to validate_uniqueness_of(:email)
     end
 
     it "requires email" do
-      expect(@subscription).to validate_presence_of(:email)
+      expect(subscription).to validate_presence_of(:email)
     end
 
     it "requires confirmation_token" do
-      expect(@subscription).to validate_presence_of(:confirmation_token)
+      expect(subscription).to validate_presence_of(:confirmation_token)
     end
 
     it "requires unique confirmation_token" do
-      expect(@subscription).to validate_uniqueness_of(:confirmation_token)
+      expect(subscription).to validate_uniqueness_of(:confirmation_token)
     end
 
     it "requires start_on" do
-      expect(@subscription).to validate_presence_of(:start_on)
+      expect(subscription).to validate_presence_of(:start_on)
     end
   end
 
@@ -109,7 +107,7 @@
   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")
+      subscription = build(:subscription, confirmation_token: "hello-im-a-token-123")
       expect(subscription.to_param).to eq("hello-im-a-token-123")
     end
 
@@ -191,7 +189,7 @@
 
     it "confirms the subscription matching the confirmation_token" do
       token = Subscription.generate_confirmation_token
-      subscription = Subscription.create!(
+      subscription = create(:subscription,
         email: "[email protected]",
         confirmation_token: token
       )
@@ -205,7 +203,7 @@
     end
 
     it "gracefully handles confirming an already confirmed subscription" do
-      subscription = Subscription.create!(
+      subscription = create(:subscription,
         email: "[email protected]",
         confirmation_token: "xyz"
       )