Update remaning models/controller/tests for rails 4

Arthur Neves
1 parent 97b59153
Showing 10 changed files with 21 additions and 17 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/apps_controller.rb
app/controllers/comments_controller.rb
app/controllers/problems_controller.rb
app/interactors/problem_updater_cache.rb
app/models/app.rb
app/models/comment.rb
app/models/notice.rb
spec/controllers/apps_controller_spec.rb
spec/controllers/problems_controller_spec.rb
@@ -15,9 +15,8 @@ class ApplicationController &lt; ActionController::Base
   rescue_from ActionController::RedirectBackError, :with => :redirect_to_root
   class StrongParametersWithEagerAttributesStrategy < DecentExposure::StrongParametersStrategy
-    def attributes
-      super
-      @attributes ||= params[inflector.param_key] || {}
+    def assign_attributes?
+      singular? && !get? && !delete? && (params[options[:param_key] || inflector.param_key]).present?
     end
   end
@@ -15,7 +15,8 @@ class AppsController &lt; ApplicationController
     app_scope.all.sort.to_a
   }
-  expose(:app, :ancestor => :app_scope)
+  expose(:app, ancestor: :app_scope, attributes: :app_params)
+
   expose(:app_decorate) do
     AppDecorator.new(app)
   end
@@ -23,6 +24,7 @@ class AppsController &lt; ApplicationController
   expose(:all_errs) {
     !!params[:all_errs]
   }
+
   expose(:problems) {
     if request.format == :atom
       app.problems.unresolved.ordered
@@ -140,4 +142,9 @@ class AppsController &lt; ApplicationController
         end
       end
     end
+
+  private
+    def app_params
+      params.require(:app).permit!
+    end
 end
@@ -3,7 +3,7 @@ class CommentsController &lt; ApplicationController
   before_filter :find_problem
   def create
-    @comment = Comment.new(params[:comment].merge(:user_id => current_user.id))
+    @comment = Comment.new(comment_params.merge(:user_id => current_user.id))
     if @comment.valid?
       @problem.comments << @comment
       @problem.save
@@ -36,5 +36,8 @@ class CommentsController &lt; ApplicationController
     def find_problem
       @problem = @app.problems.find(params[:problem_id])
     end
-end
+    def comment_params
+      params.require(:comment).permit!
+    end
+end
@@ -153,4 +153,3 @@ class ProblemsController &lt; ApplicationController
     end
   end
 end
-
@@ -22,7 +22,7 @@ class ProblemUpdaterCache
   def update_notices_count
     if @notice
-      problem.inc(:notices_count, 1)
+      problem.inc(notices_count: 1)
     else
       problem.update_attribute(
         :notices_count, problem.notices.count
@@ -172,7 +172,7 @@ class App
   end
   def regenerate_api_key!
-    set(:api_key, SecureRandom.hex)
+    update_attribute(:api_key, SecureRandom.hex)
   end
   ##
@@ -30,11 +30,11 @@ class Comment
   protected
     def increase_counter_cache
-      err.inc(:comments_count, 1)
+      err.inc(comments_count: 1)
     end
     def decrease_counter_cache
-      err.inc(:comments_count, -1) if err
+      err.inc(comments_count: -1) if err
     end
 end
@@ -139,7 +139,7 @@ class Notice
   protected
   def decrease_counter_cache
-    problem.inc(:notices_count, -1) if err
+    problem.inc(notices_count: -1) if err
   end
   def remove_cached_attributes_from_problem
@@ -195,4 +195,3 @@ class Notice
   end
 end
-
@@ -400,7 +400,5 @@ describe AppsController do
         end.to change { app.api_key }
       end
     end
-
   end
-
 end
@@ -250,7 +250,7 @@ describe ProblemsController do
     end
     it "should redirect back to problems page" do
-      request.env["Referer"] = problems_path
+      request.env["HTTP_REFERER"] = problems_path
       put :resolve, :app_id => @problem.app.id, :id => @problem.problem.id
       expect(response).to redirect_to(problems_path)
     end
@@ -446,4 +446,3 @@ describe ProblemsController do
   end
 end
-
	@@ -153,4 +153,3 @@ class ProblemsController < ApplicationController		@@ -153,4 +153,3 @@ class ProblemsController < ApplicationController
153	end	153	end
154	end	154	end
155	end	155	end
156	-
	@@ -22,7 +22,7 @@ class ProblemUpdaterCache		@@ -22,7 +22,7 @@ class ProblemUpdaterCache
22		22
23	def update_notices_count	23	def update_notices_count
24	if @notice	24	if @notice
25	- problem.inc(:notices_count, 1)	25	+ problem.inc(notices_count: 1)
26	else	26	else
27	problem.update_attribute(	27	problem.update_attribute(
28	:notices_count, problem.notices.count	28	:notices_count, problem.notices.count
	@@ -172,7 +172,7 @@ class App		@@ -172,7 +172,7 @@ class App
172	end	172	end
173		173
174	def regenerate_api_key!	174	def regenerate_api_key!
175	- set(:api_key, SecureRandom.hex)	175	+ update_attribute(:api_key, SecureRandom.hex)
176	end	176	end
177		177
178	##	178	##
	@@ -30,11 +30,11 @@ class Comment		@@ -30,11 +30,11 @@ class Comment
30		30
31	protected	31	protected
32	def increase_counter_cache	32	def increase_counter_cache
33	- err.inc(:comments_count, 1)	33	+ err.inc(comments_count: 1)
34	end	34	end
35		35
36	def decrease_counter_cache	36	def decrease_counter_cache
37	- err.inc(:comments_count, -1) if err	37	+ err.inc(comments_count: -1) if err
38	end	38	end
39		39
40	end	40	end