fixed setting params next-l/enju_leaf#649

next-l · Jul 6, 2015 · 240760f · 240760f
1 parent 30dbc0d
commit 240760f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/Appraisals b/Appraisals
@@ -1,5 +1,5 @@
 appraise "rails-3.2" do
-  gem "rails", "3.2.21"
+  gem "rails", "3.2.22"
   gem "jquery-rails"
   gem "statesman", "~> 1.0.0"
   gem "strong_parameters"
@@ -9,16 +9,16 @@ appraise "rails-3.2" do
 end
 
 appraise "rails-4.1" do
-  gem "rails", "4.1.10"
+  gem "rails", "4.1.12"
   gem "jquery-rails"
-  gem "statesman", "~> 1.2"
+  gem "statesman", "~> 1.3"
   gem "foreigner"
   gem "coveralls", require: false
 end
 
 appraise "rails-4.2" do
-  gem "rails", "4.2.1"
+  gem "rails", "4.2.3"
   gem "jquery-rails"
-  gem "statesman", "~> 1.2"
+  gem "statesman", "~> 1.3"
   gem "coveralls", require: false
 end
diff --git a/app/controllers/purchase_requests_controller.rb b/app/controllers/purchase_requests_controller.rb
@@ -141,7 +141,7 @@ def destroy
 
   private
   def purchase_request_params
-    params.require(:purchase_request).permit(
+    params.fetch(:purchase_request, {}).permit(
       :title, :author, :publisher, :isbn, :price, :url, :note, :pub_date
     )
   end

diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "jquery-rails"
-gem "rails", "3.2.21"
+gem "rails", "3.2.22"
 gem "statesman", "~> 1.0.0"
 gem "strong_parameters"
 gem "cache_digests"

diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "jquery-rails"
-gem "rails", "4.1.10"
-gem "statesman", "~> 1.2"
+gem "rails", "4.1.12"
+gem "statesman", "~> 1.3"
 gem "foreigner"
 gem "coveralls", :require => false
 

diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "jquery-rails"
-gem "rails", "4.2.1"
-gem "statesman", "~> 1.2"
+gem "rails", "4.2.3"
+gem "statesman", "~> 1.3"
 gem "coveralls", :require => false
 
 gemspec :path => "../"
diff --git a/spec/factories/user.rb b/spec/factories/user.rb
@@ -2,7 +2,6 @@
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'adminpassword'
     f.password_confirmation 'adminpassword'
     f.after(:create) do |user|
@@ -16,7 +15,6 @@
   factory :librarian, :class => User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'librarianpassword'
     f.password_confirmation 'librarianpassword'
     f.after(:create) do |user|
@@ -30,7 +28,6 @@
   factory :user, :class => User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'userpassword'
     f.password_confirmation 'userpassword'
     f.after(:create) do |user|