From 779bfbf0662cc73824277de63f50948d0373e108 Mon Sep 17 00:00:00 2001
From: Rafael Reggiani Manzo <rr.manzo@gmail.com>
Date: Wed, 19 Nov 2014 21:41:56 -0200
Subject: [PATCH] Project image form field adjusted and unit tests mocked correctly

---
 app/controllers/projects_controller.rb       | 4 ++--
 app/views/projects/_form.html.erb            | 2 +-
 spec/controllers/projects_controller_spec.rb | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index fc31f62..e313138 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -20,7 +20,7 @@ class ProjectsController < ApplicationController
   # POST /projects
   # POST /projects.json
   def create
-    image_url = project_params.delete(:url)
+    image_url = project_params.delete(:image_url)
     @project = Project.new(project_params)
     respond_to do |format|
       create_and_redir(format)
@@ -43,7 +43,7 @@ class ProjectsController < ApplicationController
 
   def update
     set_project
-    image_url = project_params.delete(:url)
+    image_url = project_params.delete(:image_url)
     if @project.update(project_params) && @project_image.update(url: image_url)
       redirect_to(project_path(@project.id))
     else
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 4c1b145..8886db3 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -17,7 +17,7 @@
       <div class="form-row">
         <div class="field-container">
           <%= f.label "Image url", class: 'control-label' %><br>
-          <%= f.text_field :url, class: 'text-area', value: @project_image.nil? ? '#' : @project_image.url  %>
+          <%= f.text_field :image_url, class: 'text-area', value: @project_image.nil? ? '#' : @project_image.url  %>
         </div>
       </div>
     </div>
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index d7bb0b1..10d3153 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -195,10 +195,9 @@ describe ProjectsController, :type => :controller do
 
   describe 'update' do
     before do
-      @project_image = FactoryGirl.create(:project_image)
-      @subject = FactoryGirl.create(:project)
+      @project_image = FactoryGirl.build(:project_image)
+      @subject = FactoryGirl.build(:project)
       @subject_params = Hash[FactoryGirl.attributes_for(:project).map { |k,v| [k.to_s, v.to_s] }]
-
     end
 
     context 'when the user is logged in' do
@@ -213,7 +212,6 @@ describe ProjectsController, :type => :controller do
           @ownerships.expects(:find_by_project_id).with("#{@subject.id}").returns(@ownership)
           User.any_instance.expects(:project_ownerships).at_least_once.returns(@ownerships)
           ProjectImage.expects(:find_by_project_id).with(@subject.id).returns(@project_image)
-
         end
 
         context 'with valid fields' do
@@ -244,7 +242,7 @@ describe ProjectsController, :type => :controller do
 
         context 'with an invalid field' do
           before :each do
-            #Project.expects(:find).with(@subject.id.to_s).returns(@subject)
+            Project.expects(:find).with(@subject.id.to_s).returns(@subject)
             Project.any_instance.expects(:update).with(@subject_params).returns(false)
 
             post :update, :id => @subject.id, :project => @subject_params
--
libgit2 0.21.2