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,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
 

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)

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

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

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

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
 

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

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
 

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,

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

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

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]"

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