From 8b0fa9e0500a5f260a93a85ba089fab49eb7b687 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Sun, 13 Jan 2013 12:17:06 +1100
Subject: [PATCH] FGified garden tests. Removed some spurious bits.

---
 spec/factories/garden.rb                   |  6 ++++++
 spec/views/gardens/edit.html.haml_spec.rb  | 12 ++----------
 spec/views/gardens/index.html.haml_spec.rb | 18 +++++-------------
 spec/views/gardens/new.html.haml_spec.rb   |  6 +-----
 spec/views/gardens/show.html.haml_spec.rb  | 13 ++-----------
 5 files changed, 16 insertions(+), 39 deletions(-)
 create mode 100644 spec/factories/garden.rb

diff --git a/spec/factories/garden.rb b/spec/factories/garden.rb
new file mode 100644
index 000000000..3581fc290
--- /dev/null
+++ b/spec/factories/garden.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :garden do
+    name 'My Garden'
+    user
+  end
+end
diff --git a/spec/views/gardens/edit.html.haml_spec.rb b/spec/views/gardens/edit.html.haml_spec.rb
index 738616758..381c15a1d 100644
--- a/spec/views/gardens/edit.html.haml_spec.rb
+++ b/spec/views/gardens/edit.html.haml_spec.rb
@@ -11,17 +11,9 @@ describe "gardens/edit" do
 
   context "logged in" do
     before(:each) do
-      @user = User.create(:email => "growstuff@example.com",
-                          :password => "irrelevant")
-      @user.confirm!
+      @user = FactoryGirl.create(:confirmed_user)
       sign_in @user
-
-      @garden = assign(:garden, stub_model(Garden,
-        :name => "MyString",
-        :user_id => @user.id,
-        :slug => "MyString"
-      ))
-
+      @garden = assign(:garden, FactoryGirl.create(:garden, :user => @user))
       render
     end
 
diff --git a/spec/views/gardens/index.html.haml_spec.rb b/spec/views/gardens/index.html.haml_spec.rb
index 6da0c96f7..d657a8970 100644
--- a/spec/views/gardens/index.html.haml_spec.rb
+++ b/spec/views/gardens/index.html.haml_spec.rb
@@ -2,25 +2,17 @@ require 'spec_helper'
 
 describe "gardens/index" do
   before(:each) do
+    @user = FactoryGirl.create(:user)
     assign(:gardens, [
-      stub_model(Garden,
-        :name => "Name",
-        :user_id => "",
-        :slug => "Slug"
-      ),
-      stub_model(Garden,
-        :name => "Name",
-        :user_id => "",
-        :slug => "Slug"
-      )
+      FactoryGirl.create(:garden, :user => @user),
+      FactoryGirl.create(:garden, :user => @user)
     ])
   end
 
   it "renders a list of gardens" do
     render
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "tr>td", :text => "Name".to_s, :count => 2
-    assert_select "tr>td", :text => "".to_s, :count => 2
-    assert_select "tr>td", :text => "Slug".to_s, :count => 2
+    assert_select "tr>td", :text => "My Garden".to_s, :count => 2
   end
+
 end
diff --git a/spec/views/gardens/new.html.haml_spec.rb b/spec/views/gardens/new.html.haml_spec.rb
index aca4be29e..a7cc596ab 100644
--- a/spec/views/gardens/new.html.haml_spec.rb
+++ b/spec/views/gardens/new.html.haml_spec.rb
@@ -2,11 +2,7 @@ require 'spec_helper'
 
 describe "gardens/new" do
   before(:each) do
-    assign(:garden, stub_model(Garden,
-      :name => "MyString",
-      :user_id => "",
-      :slug => "MyString"
-    ).as_new_record)
+    assign(:garden, FactoryGirl.create(:garden))
   end
 
   it "renders new garden form" do
diff --git a/spec/views/gardens/show.html.haml_spec.rb b/spec/views/gardens/show.html.haml_spec.rb
index 6e73eb0a9..6f5a599ba 100644
--- a/spec/views/gardens/show.html.haml_spec.rb
+++ b/spec/views/gardens/show.html.haml_spec.rb
@@ -2,17 +2,8 @@ require 'spec_helper'
 
 describe "gardens/show" do
   before(:each) do
-    @user = User.create(
-        :username => 'foo',
-        :email => 'foo@example.com',
-        :password => 'irrelevant',
-        :tos_agreement => true
-    )
-    @user.confirm!
-    @garden = assign(:garden, stub_model(Garden,
-      :name => "Garden Name",
-      :user_id => @user.id
-    ))
+    @user = FactoryGirl.create(:confirmed_user)
+    @garden = assign(:garden, FactoryGirl.create(:garden, :user => @user))
   end
 
   context 'logged out' do