Updated the gems

Got rid of the ActiveSupport::Concern deprecation warning. Had to fix some specs to get rid of some new FactoryGirl deprecation warnings.
dgilperez · Apr 5, 2012 · 128d927 · 128d927
1 parent c2aca40
commit 128d927
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 50 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -28,10 +28,10 @@ GEM
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
+    arel (3.0.2)
+    bson (1.6.2)
+    bson_ext (1.6.2)
+      bson (~> 1.6.2)
     builder (3.0.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -40,55 +40,54 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    commonjs (0.2.0)
-      therubyracer (~> 0.9.9)
-    database_cleaner (0.7.1)
+    commonjs (0.2.5)
+    database_cleaner (0.7.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (2.3.2)
-      activesupport
-    factory_girl_rails (1.4.0)
-      factory_girl (~> 2.3.0)
+    factory_girl (3.0.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (3.0.0)
+      factory_girl (~> 3.0.0)
       railties (>= 3.0.0)
     ffi (1.0.11)
-    guard (1.0.0)
+    guard (1.0.1)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
-    guard-rspec (0.6.0)
+    guard-rspec (0.7.0)
       guard (>= 0.10.0)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.1)
-    jquery-rails (2.0.0)
-      railties (>= 3.2.0.beta, < 5.0)
+    journey (1.0.3)
+    jquery-rails (2.0.2)
+      railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.5)
-    less (2.0.9)
+    json (1.6.6)
+    less (2.1.0)
       commonjs (~> 0.2.0)
-      therubyracer (~> 0.9.9)
-    less-rails (2.1.6)
+      therubyracer (~> 0.10.0)
+    less-rails (2.2.0)
       actionpack (>= 3.1)
-      less (~> 2.0.7)
+      less (~> 2.1.0)
     libv8 (3.3.10.4)
-    mail (2.4.1)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    mongo_mapper (0.11.0)
+    mime-types (1.18)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongo_mapper (0.11.1)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
       plucky (~> 0.4.0)
-    multi_json (1.0.4)
+    multi_json (1.2.0)
     plucky (0.4.4)
       mongo (~> 1.5)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
@@ -112,44 +111,44 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.9.0)
     sass (3.1.15)
-    sass-rails (3.2.4)
+    sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    simple_form (2.0.0)
+    simple_form (2.0.1)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.9.10)
+    therubyracer (0.10.0)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    twitter-bootstrap-rails (2.0.2)
+    twitter-bootstrap-rails (2.0.5)
       actionpack (>= 3.1)
-      less-rails (~> 2.1.5)
+      less-rails (~> 2.2.0)
       railties (>= 3.1)
-    tzinfo (0.3.31)
-    uglifier (1.2.3)
+    tzinfo (0.3.32)
+    uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
 

diff --git a/spec/models/character_spec.rb b/spec/models/character_spec.rb
@@ -78,7 +78,7 @@
 
   describe "roll_initiative" do
     it "returns an initiative roll" do
-      Factory(:character).roll_initiative.should be_a(Fixnum)
+      FactoryGirl.create(:character).roll_initiative.should be_a(Fixnum)
     end
   end
 end
diff --git a/spec/models/encounter_spec.rb b/spec/models/encounter_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Encounter do
-  subject { Factory(:encounter) }
+  subject { FactoryGirl.create(:encounter) }
 
   it { should respond_to(:explain_npcs) }
   it { should respond_to(:count_of) }