From 91351c777576ac4745720a426177406234e4f7a9 Mon Sep 17 00:00:00 2001
From: Dan Barber <danbee@gmail.com>
Date: Fri, 31 May 2013 08:37:31 +0100
Subject: [PATCH] Add photo factory andn photo controller spec.

---
 app/controllers/photos_controller.rb       |  7 +------
 spec/controllers/photos_controller_spec.rb | 19 +++++++++++++++++++
 spec/factories/photos.rb                   |  8 ++++++++
 3 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 spec/controllers/photos_controller_spec.rb
 create mode 100644 spec/factories/photos.rb

diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 1ca84c1..d2169b7 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -1,16 +1,11 @@
 class PhotosController < ApplicationController
-  def new
-    @photo = Photo.new
-    @categories = Category.find(:all).map { |c| [c.name, c.id] }
-  end
-
   def index
     if params[:category_id]
       @category = Category.find_by_id(params[:category_id])
       @photos = @category.photos.enabled.order{taken_at.desc}.paginate(:page => params[:page], :per_page => 11)
       @page_title = @category.name
     else
-      @photos = Photo.enabled.order(:taken_at.desc).paginate :all, :page => params[:page], :per_page => 11
+      @photos = Photo.enabled.order{taken_at.desc}.paginate(:page => params[:page], :per_page => 11)
       @page_title = 'All Photos'
     end
     respond_to do |format|
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
new file mode 100644
index 0000000..9cce455
--- /dev/null
+++ b/spec/controllers/photos_controller_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe PhotosController do
+  describe "GET index" do
+    it "renders the index template" do
+      get :index
+      expect(response).to render_template(:index)
+    end
+  end
+
+  describe "GET log_view" do
+    let(:photo) { create(:photo) }
+
+    it "logs a photo view" do
+      photo.should_receive(:log_view).once
+      get :log_view, id: photo.id
+    end
+  end
+end
diff --git a/spec/factories/photos.rb b/spec/factories/photos.rb
new file mode 100644
index 0000000..2ef9f04
--- /dev/null
+++ b/spec/factories/photos.rb
@@ -0,0 +1,8 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :photo do
+    title "A Photo"
+    description "A lovely photo of a tree"
+  end
+end