Bumping versions on Rails and other stuff. FactoryGirl went up to ver…

…sion 4 which got rid of the Factory object. Switched to FactoryGirl where used.
docjason · Aug 27, 2012 · 3202e4c · 3202e4c
1 parent e064e36
commit 3202e4c
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 119 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 
-gem 'rails', '3.2.2'
+gem 'rails', '3.2.8'
 # gem "health-data-standards", :git => "http://github.com/projectcypress/health-data-standards.git", :branch => "develop"
 gem "health-data-standards", :git => "http://github.com/ssayer/health-data-standards.git", :branch => "develop"
 gem 'ruby-openid', :git => 'https://github.com/rdingwell/ruby-openid.git',:branch => "master" 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,23 +1,23 @@
 GIT
   remote: http://github.com/ssayer/health-data-standards.git
-  revision: c88f614818cc338534a06d036e208ea93ab19d74
+  revision: 0d7bdd630b3c6730de2b06949554ad61d0607c7c
   branch: develop
   specs:
-    health-data-standards (0.8.0)
+    health-data-standards (1.0.0)
       builder (~> 3.0.0)
       erubis (~> 2.6)
       mongoid (~> 2.4.2)
-      nokogiri (~> 1.4.7)
+      nokogiri (>= 1.4.4)
       uuid (~> 2.3.4)
 
 GIT
   remote: https://github.com/rdingwell/devise_oauth2_providable.git
-  revision: 8ede1009ef9edbc8994eb6521293a68aee7e9b71
+  revision: 99d0ca56786f86a8e28875d462c99f9e344ac2f9
   branch: master
   specs:
     devise_oauth2_providable (1.0.5)
       devise (>= 1.4.3)
-      rack-oauth2 (~> 0.11.0)
+      rack-oauth2 (>= 0.11.0)
       rails (>= 3.1.0)
 
 GIT
@@ -30,159 +30,160 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.7)
-    ansi (1.4.2)
+    addressable (2.3.2)
+    ansi (1.4.3)
     arel (3.0.2)
     attr_required (0.0.5)
     bcrypt-ruby (3.0.1)
-    bson (1.6.1)
-    bson_ext (1.6.1)
-      bson (~> 1.6.1)
+    bson (1.6.4)
+    bson_ext (1.6.4)
+      bson (~> 1.6.4)
     builder (3.0.0)
-    capistrano (2.11.2)
+    capistrano (2.13.3)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    coderay (1.0.5)
+    coderay (1.0.7)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
-    configatron (2.9.0)
+    coffee-script-source (1.3.3)
+    configatron (2.9.1)
       yamler (>= 0.1.0)
     cover_me (1.2.0)
       configatron
       hashie
-    curb (0.7.18)
-    daemons (1.1.8)
-    devise (2.0.4)
+    curb (0.8.1)
+    daemons (1.1.9)
+    devise (2.1.2)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
+      orm_adapter (~> 0.1)
       railties (~> 3.1)
-      warden (~> 1.1.1)
+      warden (~> 1.2.1)
     erubis (2.7.0)
     eventmachine (0.12.10)
-    execjs (1.3.0)
+    excon (0.16.1)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (3.0.0)
+    factory_girl (4.0.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (3.0.0)
-      factory_girl (~> 3.0.0)
+    factory_girl_rails (4.0.0)
+      factory_girl (~> 4.0.0)
       railties (>= 3.0.0)
-    feedzirra (0.0.31)
-      activesupport (>= 3.0.8)
-      builder (~> 3.0.0)
-      curb (~> 0.7.15)
-      i18n (>= 0.5.0)
-      loofah (~> 1.0.0)
-      nokogiri (~> 1.4.4)
-      rake (>= 0.9.2)
-      rdoc (~> 3.8)
-      sax-machine (~> 0.0.20)
+    feedzirra (0.0.24)
+      activesupport (>= 2.3.8)
+      builder (>= 2.1.2)
+      curb (>= 0.2.3)
+      loofah (>= 0.3.1)
+      nokogiri (> 0.0.0)
+      sax-machine (>= 0.0.12)
     hashie (1.2.0)
-    heroku (2.23.0)
+    heroku (2.30.5)
+      heroku-api (~> 0.3.4)
       launchy (>= 0.3.2)
-      netrc (~> 0.7.1)
+      netrc (~> 0.7.7)
       rest-client (~> 1.6.1)
       rubyzip
-    highline (1.6.11)
+    heroku-api (0.3.4)
+      excon (~> 0.16.1)
+    highline (1.6.14)
     hike (1.2.1)
-    httpclient (2.2.4)
+    httpclient (2.2.7)
     i18n (0.6.0)
-    journey (1.0.3)
-    jquery-rails (2.0.1)
-      railties (>= 3.2.0, < 5.0)
+    journey (1.0.4)
+    jquery-rails (2.1.1)
+      railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.6)
+    json (1.7.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
+    launchy (2.1.2)
+      addressable (~> 2.3)
     libv8 (3.3.10.4)
-    loofah (1.0.0)
-      nokogiri (>= 1.3.3)
-    macaddr (1.5.0)
-      systemu (>= 2.4.0)
+    loofah (1.2.1)
+      nokogiri (>= 1.4.4)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.7.1)
-    mime-types (1.18)
-    minitest (2.11.4)
-    mongo (1.6.1)
-      bson (~> 1.6.1)
-    mongoid (2.4.7)
+    method_source (0.8)
+    mime-types (1.19)
+    minitest (3.3.0)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.12)
       activemodel (~> 3.1)
-      mongo (~> 1.3)
+      mongo (<= 1.6.2)
       tzinfo (~> 0.3.22)
-    multi_json (1.2.0)
+    multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.3.0)
+    net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    netrc (0.7.1)
-    nokogiri (1.4.7)
-    omniauth (1.0.3)
+    netrc (0.7.7)
+    nokogiri (1.5.5)
+    omniauth (1.1.1)
       hashie (~> 1.2)
       rack
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
-    orm_adapter (0.0.7)
+    orm_adapter (0.4.0)
     polyglot (0.3.3)
-    pry (0.9.8.4)
+    pry (0.9.10)
       coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
-    pry-nav (0.2.0)
-      pry (~> 0.9.8.1)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    pry-nav (0.2.2)
+      pry (~> 0.9.10)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-oauth2 (0.11.0)
+    rack-oauth2 (0.14.9)
       activesupport (>= 2.3)
-      attr_required (>= 0.0.3)
+      attr_required (>= 0.0.5)
       httpclient (>= 2.2.0.2)
       i18n
-      json (>= 1.4.3)
+      multi_json (>= 1.3.6)
       rack (>= 1.1)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
@@ -191,61 +192,61 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rubyzip (0.9.6.1)
-    sass (3.1.15)
+    rubyzip (0.9.9)
+    sass (3.2.1)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sax-machine (0.0.20)
+    sax-machine (0.1.0)
       nokogiri (> 0.0.0)
-    slop (2.4.4)
-    sprockets (2.1.2)
+    slop (3.3.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     symbolize (4.2.0)
-    systemu (2.5.0)
-    therubyracer (0.10.0)
+    systemu (2.5.2)
+    therubyracer (0.10.2)
       libv8 (~> 3.3.10)
-    thin (1.3.1)
+    thin (1.4.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    turn (0.9.4)
+    turn (0.9.6)
       ansi
-    tzinfo (0.3.32)
-    uglifier (1.2.4)
+    tzinfo (0.3.33)
+    uglifier (1.2.7)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.3)
     uuid (2.3.5)
       macaddr (~> 1.0)
-    warden (1.1.1)
+    warden (1.2.1)
       rack (>= 1.0)
     yamler (0.1.0)
 
@@ -272,7 +273,7 @@ DEPENDENCIES
   omniauth-openid
   pry
   pry-nav
-  rails (= 3.2.2)
+  rails (= 3.2.8)
   ruby-openid!
   sass-rails (~> 3.2.3)
   symbolize

diff --git a/test/functional/notifications_controller_test.rb b/test/functional/notifications_controller_test.rb
@@ -23,7 +23,7 @@ class NotificationsControllerTest < ActionController::TestCase
   end
 
   test "should create notification" do
-    n = Factory.attributes_for(:notification)
+    n = FactoryGirl.attributes_for(:notification)
 
     assert_difference('Notification.count') do
       post :create, notification: n

diff --git a/test/functional/notify_configs_controller_test.rb b/test/functional/notify_configs_controller_test.rb
@@ -22,7 +22,7 @@ class NotifyConfigsControllerTest < ActionController::TestCase
   end
 
   test "should create notify_config" do
-    n = Factory.attributes_for(:notify_config)
+    n = FactoryGirl.attributes_for(:notify_config)
 
     assert_difference('NotifyConfig.count') do
       post :create, notify_config: n