From 21fb60c9c7aa99dedbb056ebd132103bf7007cc6 Mon Sep 17 00:00:00 2001 From: emgord Date: Wed, 30 Mar 2016 11:20:59 -0700 Subject: [PATCH] fixed spec to reflect how params come in from form --- spec/controllers/admin/content_controller_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/controllers/admin/content_controller_spec.rb b/spec/controllers/admin/content_controller_spec.rb index 060ef7ec0c..ea30933afc 100644 --- a/spec/controllers/admin/content_controller_spec.rb +++ b/spec/controllers/admin/content_controller_spec.rb @@ -518,7 +518,7 @@ def base_article(options={}) it 'should merge articles' do article2 = Factory(:article) lambda do - get :merge, :id => @article.id, :merge_id => article2.id + get :merge, :id => @article.id, :merge_with =>{:merge_id => article2.id } response.should redirect_to(:action => 'index') expect(Article.find(@article.id).attributes).to_not eq @article.attributes end.should change(Article, :count) @@ -686,7 +686,7 @@ def base_article(options={}) it 'should not allow contributor to merge articles' do article2 = Factory(:article, :user => @user) lambda do - get :merge, :id => @article.id, :merge_id => article2.id + get :merge, :id => @article.id, :merge_with =>{:merge_id => article2.id } response.should redirect_to(:action => 'index') expect(Article.find(@article.id).attributes).to eq @article.attributes end.should_not change(Article, :count)