Permalink
Browse files

fixed remaining tests

Added Gemfile.lock
  • Loading branch information...
1 parent 0af842d commit 6798ff42ab8495a6608ebd8b686c28a5c4dc2a1b @johnny committed Mar 5, 2012
Showing with 63 additions and 51 deletions.
  1. +60 −49 Gemfile.lock
  2. +1 −1 lib/dm-paperclip/thumbnail.rb
  3. +1 −0 test/paperclip_test.rb
  4. +1 −1 test/thumbnail_test.rb
View
@@ -1,67 +1,78 @@
GEM
remote: http://rubygems.org/
specs:
- addressable (2.2.6)
+ addressable (2.2.7)
aws-s3 (0.6.2)
builder
mime-types
xml-simple
- bcrypt-ruby (2.1.4)
+ bcrypt-ruby (3.0.1)
builder (3.0.0)
- data_objects (0.10.6)
+ data_objects (0.10.8)
addressable (~> 2.1)
- datamapper (1.1.0)
- dm-aggregates (= 1.1.0)
- dm-constraints (= 1.1.0)
- dm-core (= 1.1.0)
- dm-migrations (= 1.1.0)
- dm-serializer (= 1.1.0)
- dm-timestamps (= 1.1.0)
- dm-transactions (= 1.1.0)
- dm-types (= 1.1.0)
- dm-validations (= 1.1.0)
- dm-aggregates (1.1.0)
- dm-core (~> 1.1.0)
- dm-constraints (1.1.0)
- dm-core (~> 1.1.0)
- dm-core (1.1.0)
- addressable (~> 2.2.4)
- dm-do-adapter (1.1.0)
- data_objects (~> 0.10.2)
- dm-core (~> 1.1.0)
- dm-migrations (1.1.0)
- dm-core (~> 1.1.0)
- dm-serializer (1.1.0)
- dm-core (~> 1.1.0)
+ datamapper (1.2.0)
+ dm-aggregates (~> 1.2.0)
+ dm-constraints (~> 1.2.0)
+ dm-core (~> 1.2.0)
+ dm-migrations (~> 1.2.0)
+ dm-serializer (~> 1.2.0)
+ dm-timestamps (~> 1.2.0)
+ dm-transactions (~> 1.2.0)
+ dm-types (~> 1.2.0)
+ dm-validations (~> 1.2.0)
+ dm-aggregates (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-constraints (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-core (1.2.0)
+ addressable (~> 2.2.6)
+ dm-do-adapter (1.2.0)
+ data_objects (~> 0.10.6)
+ dm-core (~> 1.2.0)
+ dm-migrations (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-serializer (1.2.1)
+ dm-core (~> 1.2.0)
fastercsv (~> 1.5.4)
- json (~> 1.4.6)
- dm-sqlite-adapter (1.1.0)
- dm-do-adapter (~> 1.1.0)
- do_sqlite3 (~> 0.10.2)
- dm-timestamps (1.1.0)
- dm-core (~> 1.1.0)
- dm-transactions (1.1.0)
- dm-core (~> 1.1.0)
- dm-types (1.1.0)
- bcrypt-ruby (~> 2.1.4)
- dm-core (~> 1.1.0)
+ json (~> 1.6.1)
+ json_pure (~> 1.6.1)
+ multi_json (~> 1.0.3)
+ dm-sqlite-adapter (1.2.0)
+ dm-do-adapter (~> 1.2.0)
+ do_sqlite3 (~> 0.10.6)
+ dm-timestamps (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-transactions (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-types (1.2.1)
+ bcrypt-ruby (~> 3.0.0)
+ dm-core (~> 1.2.0)
fastercsv (~> 1.5.4)
- json (~> 1.4.6)
- stringex (~> 1.2.0)
+ json (~> 1.6.1)
+ multi_json (~> 1.0.3)
+ stringex (~> 1.3.0)
uuidtools (~> 2.1.2)
- dm-validations (1.1.0)
- dm-core (~> 1.1.0)
- do_sqlite3 (0.10.6)
- data_objects (= 0.10.6)
+ dm-validations (1.2.0)
+ dm-core (~> 1.2.0)
+ do_sqlite3 (0.10.8)
+ data_objects (= 0.10.8)
extlib (0.9.15)
fastercsv (1.5.4)
- json (1.4.6)
- mime-types (1.16)
- mocha (0.9.12)
- shoulda (2.11.3)
- stringex (1.2.1)
+ json (1.6.5)
+ json_pure (1.6.5)
+ metaclass (0.0.1)
+ mime-types (1.17.2)
+ mocha (0.10.5)
+ metaclass (~> 0.0.1)
+ multi_json (1.0.4)
+ shoulda (3.0.1)
+ shoulda-context (~> 1.0.0)
+ shoulda-matchers (~> 1.0.0)
+ shoulda-context (1.0.0)
+ shoulda-matchers (1.0.0)
+ stringex (1.3.2)
uuidtools (2.1.2)
- xml-simple (1.1.0)
+ xml-simple (1.1.1)
PLATFORMS
ruby
@@ -39,7 +39,7 @@ def convert_options?
# that contains the new image.
def make
src = @file
- dst = Tempfile.new([@basename, @format].compact.join("."))
+ dst = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
dst.binmode
command = <<-end_command
View
@@ -62,6 +62,7 @@ class PaperclipTest < Test::Unit::TestCase
context "with a subclass" do
setup do
class ::SubDummy < Dummy; end
+ SubDummy.finalize
end
should "be able to use the attachment from the subclass" do
View
@@ -4,7 +4,7 @@ class ThumbnailTest < Test::Unit::TestCase
context "A Paperclip Tempfile" do
setup do
- @tempfile = Paperclip::Tempfile.new("file.jpg")
+ @tempfile = Paperclip::Tempfile.new(["file", ".jpg"])
end
should "have its path contain a real extension" do

0 comments on commit 6798ff4

Please sign in to comment.