From 72bb1a641fbf462dc2cb51fb1524e0f7f4388ca6 Mon Sep 17 00:00:00 2001 From: Skud Date: Sun, 13 Jan 2013 13:10:24 +1100 Subject: [PATCH] Made the :user factory be confirmed by default. We hardly ever actually need an unconfirmed user, but if we do, there is now :unconfirmed_user for that purpose. --- spec/factories/user.rb | 5 +++-- spec/models/planting_spec.rb | 2 +- spec/views/crops/edit.html.haml_spec.rb | 2 +- spec/views/crops/new.html.haml_spec.rb | 2 +- spec/views/gardens/edit.html.haml_spec.rb | 2 +- spec/views/gardens/show.html.haml_spec.rb | 2 +- spec/views/members/show.html.haml_spec.rb | 1 - spec/views/plantings/new.html.haml_spec.rb | 20 +++++++++---------- spec/views/plantings/show.html.haml_spec.rb | 2 +- .../scientific_names/edit.html.haml_spec.rb | 2 +- .../scientific_names/new.html.haml_spec.rb | 2 +- spec/views/updates/edit.html.haml_spec.rb | 6 ++---- spec/views/updates/new.html.haml_spec.rb | 4 ++-- 13 files changed, 25 insertions(+), 27 deletions(-) diff --git a/spec/factories/user.rb b/spec/factories/user.rb index b36b03f08..54124fc73 100644 --- a/spec/factories/user.rb +++ b/spec/factories/user.rb @@ -5,14 +5,15 @@ FactoryGirl.define do password 'password1' email 'user1@example.com' tos_agreement true + confirmed_at Time.now() factory :no_tos_user do tos_agreement false email 'notos@example.com' end - factory :confirmed_user do - confirmed_at Time.now() + factory :unconfirmed_user do + confirmed_at nil email 'confirmed@example.com' end diff --git a/spec/models/planting_spec.rb b/spec/models/planting_spec.rb index 6973bb306..24d09bd6f 100644 --- a/spec/models/planting_spec.rb +++ b/spec/models/planting_spec.rb @@ -4,7 +4,7 @@ describe Planting do before(:each) do @crop = FactoryGirl.create(:tomato) - @user = FactoryGirl.create(:confirmed_user) + @user = FactoryGirl.create(:user) @garden = FactoryGirl.create(:garden, :user => @user) @planting = FactoryGirl.create(:planting, :crop => @crop, :garden => @garden) diff --git a/spec/views/crops/edit.html.haml_spec.rb b/spec/views/crops/edit.html.haml_spec.rb index c400c83a0..e513f8d8e 100644 --- a/spec/views/crops/edit.html.haml_spec.rb +++ b/spec/views/crops/edit.html.haml_spec.rb @@ -14,7 +14,7 @@ describe "crops/edit" do context "logged in" do before(:each) do - @user = FactoryGirl.create(:confirmed_user) + @user = FactoryGirl.create(:user) sign_in @user render end diff --git a/spec/views/crops/new.html.haml_spec.rb b/spec/views/crops/new.html.haml_spec.rb index d92ef4fb0..47c41b90b 100644 --- a/spec/views/crops/new.html.haml_spec.rb +++ b/spec/views/crops/new.html.haml_spec.rb @@ -15,7 +15,7 @@ describe "crops/new" do context "logged in" do before(:each) do - @user = FactoryGirl.create(:confirmed_user) + @user = FactoryGirl.create(:user) sign_in @user render end diff --git a/spec/views/gardens/edit.html.haml_spec.rb b/spec/views/gardens/edit.html.haml_spec.rb index 381c15a1d..6533de89d 100644 --- a/spec/views/gardens/edit.html.haml_spec.rb +++ b/spec/views/gardens/edit.html.haml_spec.rb @@ -11,7 +11,7 @@ describe "gardens/edit" do context "logged in" do before(:each) do - @user = FactoryGirl.create(:confirmed_user) + @user = FactoryGirl.create(:user) sign_in @user @garden = assign(:garden, FactoryGirl.create(:garden, :user => @user)) render diff --git a/spec/views/gardens/show.html.haml_spec.rb b/spec/views/gardens/show.html.haml_spec.rb index 6f5a599ba..a2d20875e 100644 --- a/spec/views/gardens/show.html.haml_spec.rb +++ b/spec/views/gardens/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe "gardens/show" do before(:each) do - @user = FactoryGirl.create(:confirmed_user) + @user = FactoryGirl.create(:user) @garden = assign(:garden, FactoryGirl.create(:garden, :user => @user)) end diff --git a/spec/views/members/show.html.haml_spec.rb b/spec/views/members/show.html.haml_spec.rb index 23e53a817..be1483e6b 100644 --- a/spec/views/members/show.html.haml_spec.rb +++ b/spec/views/members/show.html.haml_spec.rb @@ -28,7 +28,6 @@ describe "members/show" do context "signed in user" do before(:each) do - @member.confirm! sign_in @member render end diff --git a/spec/views/plantings/new.html.haml_spec.rb b/spec/views/plantings/new.html.haml_spec.rb index 3cc476178..468b3d067 100644 --- a/spec/views/plantings/new.html.haml_spec.rb +++ b/spec/views/plantings/new.html.haml_spec.rb @@ -2,7 +2,16 @@ require 'spec_helper' describe "plantings/new" do before(:each) do - assign(:planting, FactoryGirl.create(:planting)) + @user = FactoryGirl.create(:user) + + # create gardens and crops to populate dropdowns + @garden1 = FactoryGirl.create(:garden, :user => @user, :name => 'Garden1') + @garden2 = FactoryGirl.create(:garden, :user => @user, :name => 'Garden2') + @crop1 = FactoryGirl.create(:tomato) + @crop2 = FactoryGirl.create(:maize) + + assign(:planting, FactoryGirl.create(:planting, :garden => @garden1)) + end context "logged out" do @@ -14,18 +23,9 @@ describe "plantings/new" do context "logged in" do before(:each) do - @user = FactoryGirl.create(:confirmed_user) sign_in @user - - # create gardens and crops to populate dropdowns - @garden1 = FactoryGirl.create(:garden, :user => @user, :name => 'Garden1') - @garden2 = FactoryGirl.create(:garden, :user => @user, :name => 'Garden2') - @crop1 = FactoryGirl.create(:tomato) - @crop2 = FactoryGirl.create(:maize) - assign(:crop, @crop2) assign(:garden, @garden2) - render end diff --git a/spec/views/plantings/show.html.haml_spec.rb b/spec/views/plantings/show.html.haml_spec.rb index a61db1753..1af1abab9 100644 --- a/spec/views/plantings/show.html.haml_spec.rb +++ b/spec/views/plantings/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe "plantings/show" do before(:each) do - @user = FactoryGirl.create(:confirmed_user) + @user = FactoryGirl.create(:user) @garden = FactoryGirl.create(:garden, :user => @user) @crop = FactoryGirl.create(:tomato) @planting = assign(:planting, diff --git a/spec/views/scientific_names/edit.html.haml_spec.rb b/spec/views/scientific_names/edit.html.haml_spec.rb index 938f88c09..541136fcb 100644 --- a/spec/views/scientific_names/edit.html.haml_spec.rb +++ b/spec/views/scientific_names/edit.html.haml_spec.rb @@ -16,7 +16,7 @@ describe "scientific_names/edit" do context "logged in" do before(:each) do - @user = FactoryGirl.create(:confirmed_user) + @user = FactoryGirl.create(:user) sign_in @user render end diff --git a/spec/views/scientific_names/new.html.haml_spec.rb b/spec/views/scientific_names/new.html.haml_spec.rb index 8d79f0d0c..9db18fa8d 100644 --- a/spec/views/scientific_names/new.html.haml_spec.rb +++ b/spec/views/scientific_names/new.html.haml_spec.rb @@ -14,7 +14,7 @@ describe "scientific_names/new" do context "logged in" do before(:each) do - @user = FactoryGirl.create(:confirmed_user) + @user = FactoryGirl.create(:user) sign_in @user render end diff --git a/spec/views/updates/edit.html.haml_spec.rb b/spec/views/updates/edit.html.haml_spec.rb index a6f5df993..1d7c28d90 100644 --- a/spec/views/updates/edit.html.haml_spec.rb +++ b/spec/views/updates/edit.html.haml_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' describe "updates/edit" do before(:each) do - @update = assign(:update, FactoryGirl.create(:update)) + @user = FactoryGirl.create(:user) + @update = assign(:update, FactoryGirl.create(:update, :user => @user)) end context "logged out" do @@ -14,14 +15,11 @@ describe "updates/edit" do context "logged in" do before(:each) do - @user = FactoryGirl.create(:confirmed_user) sign_in @user render end it "renders the edit update form" do - render - assert_select "form", :action => updates_path(@update), :method => "post" do assert_select "input#update_subject", :name => "update[subject]" assert_select "textarea#update_body", :name => "update[body]" diff --git a/spec/views/updates/new.html.haml_spec.rb b/spec/views/updates/new.html.haml_spec.rb index 7cbcf9178..611a4a7e3 100644 --- a/spec/views/updates/new.html.haml_spec.rb +++ b/spec/views/updates/new.html.haml_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' describe "updates/new" do before(:each) do - assign(:update, FactoryGirl.create(:update)) + @user = FactoryGirl.create(:user) + assign(:update, FactoryGirl.create(:update, :user => @user)) end context "logged out" do @@ -14,7 +15,6 @@ describe "updates/new" do context "logged in" do before(:each) do - @user = FactoryGirl.create(:confirmed_user) sign_in @user render end