fixed spec to reflect how params come in from form

Ada-C4 · Mar 30, 2016 · 21fb60c · 21fb60c
1 parent c40e808
commit 21fb60c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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)