Skip to content

Commit eb1381c

Browse files
committed
build using rails_apps_composer 2.2.13
1 parent 5744442 commit eb1381c

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ group :assets do
88
end
99
gem 'jquery-rails'
1010
gem "rspec-rails", ">= 2.11.0", :group => [:development, :test]
11-
gem "capybara", ">= 1.1.2", :group => :test
1211
gem "email_spec", ">= 1.2.1", :group => :test
1312
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
1413
gem "database_cleaner", ">= 0.8.0", :group => :test
1514
gem "launchy", ">= 2.1.2", :group => :test
15+
gem "capybara", ">= 1.1.2", :group => :test
1616
gem "factory_girl_rails", ">= 4.1.0", :group => [:development, :test]
17-
gem "devise", ">= 2.1.2"
17+
gem "devise", ">= 2.1.2"
18+
gem "quiet_assets", ">= 1.0.1", :group => :development

Gemfile.lock

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ GEM
5757
capybara (>= 1.1.2)
5858
cucumber (>= 1.1.8)
5959
nokogiri (>= 1.5.0)
60-
database_cleaner (0.8.0)
60+
database_cleaner (0.9.1)
6161
devise (2.1.2)
6262
bcrypt-ruby (~> 3.0)
6363
orm_adapter (~> 0.1)
@@ -76,7 +76,7 @@ GEM
7676
factory_girl (~> 4.1.0)
7777
railties (>= 3.0.0)
7878
ffi (1.1.5)
79-
gherkin (2.11.2)
79+
gherkin (2.11.4)
8080
json (>= 1.4.6)
8181
hike (1.2.1)
8282
i18n (0.6.1)
@@ -98,6 +98,8 @@ GEM
9898
nokogiri (1.5.5)
9999
orm_adapter (0.4.0)
100100
polyglot (0.3.3)
101+
quiet_assets (1.0.1)
102+
railties (~> 3.1)
101103
rack (1.4.1)
102104
rack-cache (1.2)
103105
rack (>= 0.4)
@@ -154,7 +156,7 @@ GEM
154156
sqlite3 (1.3.6)
155157
thor (0.16.0)
156158
tilt (1.3.3)
157-
treetop (1.4.10)
159+
treetop (1.4.11)
158160
polyglot
159161
polyglot (>= 0.3.1)
160162
tzinfo (0.3.33)
@@ -179,6 +181,7 @@ DEPENDENCIES
179181
factory_girl_rails (>= 4.1.0)
180182
jquery-rails
181183
launchy (>= 2.1.2)
184+
quiet_assets (>= 1.0.1)
182185
rails (= 3.2.8)
183186
rspec-rails (>= 2.11.0)
184187
sass-rails (~> 3.2.3)
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<% flash.each do |name, msg| %>
2-
<%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>
2+
<% if msg.is_a?(String) %>
3+
<%= content_tag :div, msg, :id => "flash_#{name}" %>
4+
<% end %>
35
<% end %>

config/application.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@ class Application < Rails::Application
2020

2121
# don't generate RSpec tests for views and helpers
2222
config.generators do |g|
23+
24+
g.test_framework :rspec, fixture: true
25+
g.fixture_replacement :factory_girl
26+
27+
2328
g.view_specs false
2429
g.helper_specs false
25-
2630
end
2731

2832
# Settings in config/environments/* take precedence over those specified here.

0 commit comments

Comments
 (0)