aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/refinery/blog
diff options
context:
space:
mode:
authorPhilip Arndt <p@arndt.io>2014-08-22 18:01:29 +0200
committerPhilip Arndt <p@arndt.io>2014-08-22 18:10:51 +0200
commitea67de1af385339a07d4ab4ee06f294ad5638546 (patch)
treeb62faafa73a4d8df26630703e51fe5a80fe5e2f5 /spec/controllers/refinery/blog
parent382a3790da1a1c4643ebc3a2ab895491e3bc052f (diff)
downloadrefinerycms-blog-ea67de1af385339a07d4ab4ee06f294ad5638546.tar.gz
refinerycms-blog-ea67de1af385339a07d4ab4ee06f294ad5638546.tar.bz2
refinerycms-blog-ea67de1af385339a07d4ab4ee06f294ad5638546.zip
Upgraded some testing syntax, changed to selenium for more passable results.
Diffstat (limited to 'spec/controllers/refinery/blog')
-rw-r--r--spec/controllers/refinery/blog/admin/comments_controller_spec.rb10
-rw-r--r--spec/controllers/refinery/blog/posts_controller_spec.rb2
2 files changed, 6 insertions, 6 deletions
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")