build using rails_apps_composer 2.2.31

CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h2. 1.0.10 January 30, 2013
+
+* accommodate change from 'factory_girl_rails' 4.1.0 to 4.2.0 (fix issue #52)
+
 h2. 1.0.9 January 22, 2013
 
 * Devise default minimum password length changed from six to eight

Gemfile

@@ -13,9 +13,9 @@ gem "email_spec", ">= 1.4.0", :group => :test
 gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
 gem "launchy", ">= 2.1.2", :group => :test
 gem "capybara", ">= 2.0.2", :group => :test
-gem "factory_girl_rails", ">= 4.1.0", :group => [:development, :test]
+gem "factory_girl_rails", ">= 4.2.0", :group => [:development, :test]
 gem "bootstrap-sass", ">= 2.2.2.0"
-gem "devise", ">= 2.2.2"
+gem "devise", ">= 2.2.3"
 gem "cancan", ">= 1.6.8"
 gem "rolify", ">= 3.2.0"
 gem "simple_form", ">= 2.0.4"

Gemfile.lock

@@ -46,7 +46,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 1.0.0)
-    childprocess (0.3.6)
+    childprocess (0.3.7)
       ffi (~> 1.0, >= 1.0.6)
     coderay (1.0.8)
     coffee-rails (3.2.2)
@@ -66,7 +66,7 @@ GEM
       cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
     database_cleaner (0.9.1)
-    devise (2.2.2)
+    devise (2.2.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
@@ -78,16 +78,16 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (4.1.0)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
+    factory_girl_rails (4.2.0)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
     ffi (1.3.1)
     figaro (0.5.3)
       rails (~> 3.0)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
@@ -111,7 +111,7 @@ GEM
     rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -139,7 +139,7 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec-mocks (2.12.2)
     rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -173,7 +173,7 @@ GEM
     stripe_event (0.5.0)
       rails (~> 3.1)
       stripe (~> 1.6)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
@@ -184,7 +184,7 @@ GEM
       multi_json (~> 1.0, >= 1.0.2)
     warden (1.2.1)
       rack (>= 1.0)
-    websocket (1.0.6)
+    websocket (1.0.7)
     xpath (1.0.0)
       nokogiri (~> 1.3)
 
@@ -200,9 +200,9 @@ DEPENDENCIES
   coffee-rails (~> 3.2.1)
   cucumber-rails (>= 1.3.0)
   database_cleaner (>= 0.9.1)
-  devise (>= 2.2.2)
+  devise (>= 2.2.3)
   email_spec (>= 1.4.0)
-  factory_girl_rails (>= 4.1.0)
+  factory_girl_rails (>= 4.2.0)
   figaro (>= 0.5.3)
   jquery-rails
   launchy (>= 2.1.2)

app/views/users/_user.html.erb

@@ -5,7 +5,7 @@
       <h3>Change Role</h3>
     </div>
     <div class="modal-body">
-      <%= f.input :role_ids, :collection => Role.all, :as => :radio_buttons, :label_method => lambda {|t| t.name.titleize}, :label => false, :item_wrapper_class => 'inline' %>
+      <%= f.input :role_ids, :collection => Role.all, :as => :radio_buttons, :label_method => lambda {|t| t.name.titleize}, :label => false, :item_wrapper_class => 'inline', checked: user.role_ids.first %>
     </div>
     <div class="modal-footer">
       <%= f.submit "Change Role", :class => "btn" %>

config/application.rb

@@ -22,7 +22,7 @@ class Application < Rails::Application
     config.generators do |g|
 
       g.test_framework :rspec, fixture: true
-      g.fixture_replacement :factory_girl
+      g.fixture_replacement :factory_girl, dir: 'spec/factories'
 
 
       g.view_specs false