Commit 4fc2cb1c authored by Jonne Haß's avatar Jonne Haß

bump carrierwave

parent f2f741a5
......@@ -53,7 +53,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
# file uploading
gem 'carrierwave', '0.6.2'
gem 'carrierwave', '0.7.1'
gem 'fog', '1.6.0'
gem 'mini_magick', '3.4'
......
......@@ -77,7 +77,7 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
carrierwave (0.6.2)
carrierwave (0.7.1)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
childprocess (0.3.6)
......@@ -429,7 +429,7 @@ DEPENDENCIES
capistrano-ext (= 1.2.1)
capistrano_colors (= 0.5.5)
capybara (= 1.1.3)
carrierwave (= 0.6.2)
carrierwave (= 0.7.1)
client_side_validations (= 3.2.1)
cucumber-rails (= 1.3.0)
database_cleaner (= 0.9.1)
......
......@@ -166,7 +166,7 @@ describe Photo do
file = File.open(@fail_fixture_name)
lambda {
@photo.unprocessed_image.store! file
}.should raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: ["jpg", "jpeg", "png", "gif"]'
}.should raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: jpg, jpeg, png, gif'
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment