From ea67de1af385339a07d4ab4ee06f294ad5638546 Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Fri, 22 Aug 2014 18:01:29 +0200 Subject: Upgraded some testing syntax, changed to selenium for more passable results. --- .../refinery/blog/admin/comments_controller_spec.rb | 10 +++++----- spec/controllers/refinery/blog/posts_controller_spec.rb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'spec/controllers/refinery/blog') diff --git a/spec/controllers/refinery/blog/admin/comments_controller_spec.rb b/spec/controllers/refinery/blog/admin/comments_controller_spec.rb index dc7aef8..9346ff5 100644 --- a/spec/controllers/refinery/blog/admin/comments_controller_spec.rb +++ b/spec/controllers/refinery/blog/admin/comments_controller_spec.rb @@ -3,12 +3,12 @@ require "spec_helper" module Refinery module Blog module Admin - describe CommentsController do + describe CommentsController, type: :controller do refinery_login_with :refinery_user describe "#index" do let!(:comment) { FactoryGirl.create(:blog_comment) } - + it "succeeds" do get :index response.should be_success @@ -43,13 +43,13 @@ module Refinery post :approve, :id => comment.id response.should be_redirect end - + it "approves the comment" do post :approve, :id => comment.id Refinery::Blog::Comment.approved.count.should eq(1) end end - + describe "#rejected" do let!(:comment) { FactoryGirl.create(:rejected_comment) } @@ -72,7 +72,7 @@ module Refinery post :reject, :id => comment.id response.should be_redirect end - + it "rejects the comment" do post :reject, :id => comment.id Refinery::Blog::Comment.rejected.count.should eq(1) diff --git a/spec/controllers/refinery/blog/posts_controller_spec.rb b/spec/controllers/refinery/blog/posts_controller_spec.rb index ee948a5..4b62d53 100644 --- a/spec/controllers/refinery/blog/posts_controller_spec.rb +++ b/spec/controllers/refinery/blog/posts_controller_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" module Refinery module Blog - describe PostsController do + describe PostsController, type: :controller do before do FactoryGirl.create(:blog_post, :title => "blogpost_one") FactoryGirl.create(:blog_post, :title => "blogpost_two") -- cgit v1.2.3