comic test ok

[pettanr/pettanr.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 30c6cd9..2df19c2 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,6 +71,8 @@ GEM
     erubis (2.7.0)
     execjs (1.2.11)
       multi_json (~> 1.0)
+    factory_girl (2.6.4)
+      activesupport (>= 2.3.9)
     ffi (1.0.11-x86-mingw32)
     gherkin (2.6.9-x86-mingw32)
       json (>= 1.4.6)
@@ -89,7 +91,6 @@ GEM
     multi_json (1.0.4)
     nokogiri (1.5.0-x86-mingw32)
     orm_adapter (0.0.5)
-    pg (0.11.0-x86-mingw32)
     polyglot (0.3.3)
     rack (1.3.5)
     rack-cache (1.1)
@@ -122,7 +123,6 @@ GEM
     rake (0.9.2.2)
     rdoc (3.11)
       json (~> 1.4)
-    rmagick (2.12.0)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -155,7 +155,6 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5-x86-mingw32)
     term-ansicolor (1.0.7)
-    therubyracer-heroku (0.8.1.pre3)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -185,16 +184,14 @@ DEPENDENCIES
   cucumber-rails
   database_cleaner
   devise
+  factory_girl
   jquery-rails
   moro-miso
-  pg
   rails (= 3.1.1)
   rails-erd
-  rmagick (= 2.12.0)
   rspec
   rspec-rails
   sass-rails (~> 3.1.4)
   sqlite3
-  therubyracer-heroku
   uglifier (>= 1.0.3)
   webrat