Merge branch 'release/0.21'0.21.0.0

Conflicts:
	locale/cy/app.po
	locale/es_NI/app.po
	locale/hr/app.po
	locale/is_IS/app.po
	locale/sr@latin/app.po

1 files changed, 66 insertions, 0 deletions

diff --git a/spec/controllers/admin_comment_controller_spec.rb b/spec/controllers/admin_comment_controller_spec.rb
new file mode 100644
index 000000000..f87231e3b
--- /dev/null
+++ b/spec/controllers/admin_comment_controller_spec.rb
@@ -0,0 +1,66 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe AdminCommentController do
+
+    describe :edit do
+
+        before do
+            @comment = FactoryGirl.create(:comment)
+            get :edit, :id => @comment.id
+        end
+
+        it 'renders the edit template' do
+            expect(response).to render_template('edit')
+        end
+
+        it 'gets the comment' do
+            assigns[:comment].should == @comment
+        end
+
+    end
+
+    describe :update do
+
+        context 'on valid data submission' do
+
+            before do
+                @comment = FactoryGirl.create(:comment)
+                atts = FactoryGirl.attributes_for(:comment, :body => 'I am new')
+                put :update, :id => @comment.id, :comment => atts
+            end
+
+            it 'gets the comment' do
+                assigns[:comment].should == @comment
+            end
+
+            it 'updates the comment' do
+                Comment.find(@comment.id).body.should == 'I am new'
+            end
+
+            it 'logs the update event' do
+                most_recent_event = Comment.find(@comment.id).info_request_events.last
+                most_recent_event.event_type.should == 'edit_comment'
+                most_recent_event.comment_id.should == @comment.id
+            end
+
+            it 'shows a success notice' do
+                flash[:notice].should == "Comment successfully updated."
+            end
+
+            it 'redirects to the request page' do
+                response.should redirect_to(admin_request_path(@comment.info_request))
+            end
+        end
+
+        context 'on invalid data submission' do
+
+            it 'renders the edit template' do
+                @comment = FactoryGirl.create(:comment)
+                put :update, :id => @comment.id, :comment => {:body => ''}
+                response.should render_template('edit')
+            end
+
+        end
+    end
+
+end