Skip to content
This repository
Browse code

conform to app generated by version 1.5.5 of rails_apps_composer

  • Loading branch information...
commit 5cc9057105fe8f59e97d8df773f6581502105bc4 1 parent 1170efe
Daniel Kehoe DanielKehoe authored
6 Gemfile
@@ -7,11 +7,11 @@ group :assets do
7 7 gem 'uglifier', '>= 1.0.3'
8 8 end
9 9 gem 'jquery-rails'
10   -gem "rspec-rails", ">= 2.10.1", :group => [:development, :test]
11   -gem "factory_girl_rails", ">= 3.3.0", :group => [:development, :test]
  10 +gem "rspec-rails", ">= 2.11.0", :group => [:development, :test]
  11 +gem "factory_girl_rails", ">= 3.5.0", :group => [:development, :test]
12 12 gem "email_spec", ">= 1.2.1", :group => :test
13 13 gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
14 14 gem "capybara", ">= 1.1.2", :group => :test
15 15 gem "database_cleaner", ">= 0.8.0", :group => :test
16 16 gem "launchy", ">= 2.1.0", :group => :test
17   -gem "devise", ">= 2.1.0"
  17 +gem "devise", ">= 2.1.2"
46 Gemfile.lock
@@ -39,7 +39,7 @@ GEM
39 39 rack-test (>= 0.5.4)
40 40 selenium-webdriver (~> 2.0)
41 41 xpath (~> 0.1.4)
42   - childprocess (0.3.2)
  42 + childprocess (0.3.3)
43 43 ffi (~> 1.0.6)
44 44 coffee-rails (3.2.2)
45 45 coffee-script (>= 2.2.0)
@@ -70,13 +70,13 @@ GEM
70 70 erubis (2.7.0)
71 71 execjs (1.4.0)
72 72 multi_json (~> 1.0)
73   - factory_girl (3.4.2)
  73 + factory_girl (3.5.0)
74 74 activesupport (>= 3.0.0)
75   - factory_girl_rails (3.4.0)
76   - factory_girl (~> 3.4.0)
  75 + factory_girl_rails (3.5.0)
  76 + factory_girl (~> 3.5.0)
77 77 railties (>= 3.0.0)
78 78 ffi (1.0.11)
79   - gherkin (2.11.0)
  79 + gherkin (2.11.1)
80 80 json (>= 1.4.6)
81 81 hike (1.2.1)
82 82 i18n (0.6.0)
@@ -93,10 +93,10 @@ GEM
93 93 i18n (>= 0.4.0)
94 94 mime-types (~> 1.16)
95 95 treetop (~> 1.4.8)
96   - mime-types (1.18)
  96 + mime-types (1.19)
97 97 multi_json (1.3.6)
98   - nokogiri (1.5.4)
99   - orm_adapter (0.3.0)
  98 + nokogiri (1.5.5)
  99 + orm_adapter (0.4.0)
100 100 polyglot (0.3.3)
101 101 rack (1.4.1)
102 102 rack-cache (1.2)
@@ -123,21 +123,21 @@ GEM
123 123 rake (0.9.2.2)
124 124 rdoc (3.12)
125 125 json (~> 1.4)
126   - rspec (2.10.0)
127   - rspec-core (~> 2.10.0)
128   - rspec-expectations (~> 2.10.0)
129   - rspec-mocks (~> 2.10.0)
130   - rspec-core (2.10.1)
131   - rspec-expectations (2.10.0)
  126 + rspec (2.11.0)
  127 + rspec-core (~> 2.11.0)
  128 + rspec-expectations (~> 2.11.0)
  129 + rspec-mocks (~> 2.11.0)
  130 + rspec-core (2.11.0)
  131 + rspec-expectations (2.11.1)
132 132 diff-lcs (~> 1.1.3)
133   - rspec-mocks (2.10.1)
134   - rspec-rails (2.10.1)
  133 + rspec-mocks (2.11.1)
  134 + rspec-rails (2.11.0)
135 135 actionpack (>= 3.0)
136 136 activesupport (>= 3.0)
137 137 railties (>= 3.0)
138   - rspec (~> 2.10.0)
  138 + rspec (~> 2.11.0)
139 139 rubyzip (0.9.9)
140   - sass (3.1.19)
  140 + sass (3.1.20)
141 141 sass-rails (3.2.5)
142 142 railties (~> 3.2.0)
143 143 sass (>= 3.1.10)
@@ -152,13 +152,13 @@ GEM
152 152 rack (~> 1.0)
153 153 tilt (~> 1.1, != 1.3.0)
154 154 sqlite3 (1.3.6)
155   - thor (0.15.3)
  155 + thor (0.15.4)
156 156 tilt (1.3.3)
157 157 treetop (1.4.10)
158 158 polyglot
159 159 polyglot (>= 0.3.1)
160 160 tzinfo (0.3.33)
161   - uglifier (1.2.5)
  161 + uglifier (1.2.6)
162 162 execjs (>= 0.3.0)
163 163 multi_json (~> 1.3)
164 164 warden (1.2.1)
@@ -174,13 +174,13 @@ DEPENDENCIES
174 174 coffee-rails (~> 3.2.1)
175 175 cucumber-rails (>= 1.3.0)
176 176 database_cleaner (>= 0.8.0)
177   - devise (>= 2.1.0)
  177 + devise (>= 2.1.2)
178 178 email_spec (>= 1.2.1)
179   - factory_girl_rails (>= 3.3.0)
  179 + factory_girl_rails (>= 3.5.0)
180 180 jquery-rails
181 181 launchy (>= 2.1.0)
182 182 rails (= 3.2.6)
183   - rspec-rails (>= 2.10.1)
  183 + rspec-rails (>= 2.11.0)
184 184 sass-rails (~> 3.2.3)
185 185 sqlite3
186 186 uglifier (>= 1.0.3)
2  config/initializers/session_store.rb
... ... @@ -1,6 +1,6 @@
1 1 # Be sure to restart your server when you modify this file.
2 2
3   -Rails3DeviseRspecCucumber::Application.config.session_store :cookie_store, :key => '_rails3-devise-rspec-cucumber_session'
  3 +Rails3DeviseRspecCucumber::Application.config.session_store :cookie_store, key: '_rails3-devise-rspec-cucumber_session'
4 4
5 5 # Use the database for sessions instead of the cookie-based default,
6 6 # which shouldn't be used to store highly confidential information
6 spec/spec_helper.rb
@@ -32,4 +32,10 @@
32 32 # automatically. This will be the default behavior in future versions of
33 33 # rspec-rails.
34 34 config.infer_base_class_for_anonymous_controllers = false
  35 +
  36 + # Run specs in random order to surface order dependencies. If you find an
  37 + # order dependency and want to debug it, you can fix the order by providing
  38 + # the seed, which is printed after each run.
  39 + # --seed 1234
  40 + config.order = "random"
35 41 end

0 comments on commit 5cc9057

Please sign in to comment.
Something went wrong with that request. Please try again.