Skip to content

Commit 2b0c305

Browse files
DanielKehoeDanielKehoe
committed
build using rails_apps_composer 2.2.10
1 parent 8032e51 commit 2b0c305

File tree

4 files changed

+25
-38
lines changed

4 files changed

+25
-38
lines changed

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ group :assets do
66
gem 'uglifier', '>= 1.0.3'
77
end
88
gem 'jquery-rails'
9-
gem "mongoid", ">= 3.0.5"
9+
gem "mongoid", ">= 3.0.6"
1010
gem "rspec-rails", ">= 2.11.0", :group => [:development, :test]
1111
gem "capybara", ">= 1.1.2", :group => :test
1212
gem "database_cleaner", ">= 0.8.0", :group => :test
1313
gem "mongoid-rspec", ">= 1.4.6", :group => :test
1414
gem "email_spec", ">= 1.2.1", :group => :test
1515
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
1616
gem "launchy", ">= 2.1.2", :group => :test
17-
gem "factory_girl_rails", ">= 4.0.0", :group => [:development, :test]
17+
gem "factory_girl_rails", ">= 4.1.0", :group => [:development, :test]
1818
gem "devise", ">= 2.1.2"

‎Gemfile.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ GEM
3131
addressable (2.3.2)
3232
arel (3.0.2)
3333
bcrypt-ruby (3.0.1)
34-
builder (3.0.0)
34+
builder (3.0.3)
3535
capybara (1.1.2)
3636
mime-types (>= 1.16)
3737
nokogiri (>= 1.3.3)
@@ -70,18 +70,18 @@ GEM
7070
erubis (2.7.0)
7171
execjs (1.4.0)
7272
multi_json (~> 1.0)
73-
factory_girl (4.0.0)
73+
factory_girl (4.1.0)
7474
activesupport (>= 3.0.0)
75-
factory_girl_rails (4.0.0)
76-
factory_girl (~> 4.0.0)
75+
factory_girl_rails (4.1.0)
76+
factory_girl (~> 4.1.0)
7777
railties (>= 3.0.0)
7878
ffi (1.1.5)
7979
gherkin (2.11.2)
8080
json (>= 1.4.6)
8181
hike (1.2.1)
82-
i18n (0.6.0)
82+
i18n (0.6.1)
8383
journey (1.0.4)
84-
jquery-rails (2.1.1)
84+
jquery-rails (2.1.3)
8585
railties (>= 3.1.0, < 5.0)
8686
thor (~> 0.14)
8787
json (1.7.5)
@@ -94,7 +94,7 @@ GEM
9494
mime-types (~> 1.16)
9595
treetop (~> 1.4.8)
9696
mime-types (1.19)
97-
mongoid (3.0.5)
97+
mongoid (3.0.6)
9898
activemodel (~> 3.1)
9999
moped (~> 1.1)
100100
origin (~> 1.0)
@@ -103,18 +103,18 @@ GEM
103103
mongoid (>= 3.0.1)
104104
rake
105105
rspec (>= 2.9)
106-
moped (1.2.0)
106+
moped (1.2.5)
107107
multi_json (1.3.6)
108108
nokogiri (1.5.5)
109-
origin (1.0.7)
109+
origin (1.0.9)
110110
orm_adapter (0.4.0)
111111
polyglot (0.3.3)
112112
rack (1.4.1)
113113
rack-cache (1.2)
114114
rack (>= 0.4)
115115
rack-ssl (1.3.2)
116116
rack
117-
rack-test (0.6.1)
117+
rack-test (0.6.2)
118118
rack (>= 1.0)
119119
rails (3.2.8)
120120
actionmailer (= 3.2.8)
@@ -139,9 +139,9 @@ GEM
139139
rspec-expectations (~> 2.11.0)
140140
rspec-mocks (~> 2.11.0)
141141
rspec-core (2.11.1)
142-
rspec-expectations (2.11.2)
142+
rspec-expectations (2.11.3)
143143
diff-lcs (~> 1.1.3)
144-
rspec-mocks (2.11.2)
144+
rspec-mocks (2.11.3)
145145
rspec-rails (2.11.0)
146146
actionpack (>= 3.0)
147147
activesupport (>= 3.0)
@@ -168,9 +168,9 @@ GEM
168168
polyglot
169169
polyglot (>= 0.3.1)
170170
tzinfo (0.3.33)
171-
uglifier (1.2.7)
171+
uglifier (1.3.0)
172172
execjs (>= 0.3.0)
173-
multi_json (~> 1.3)
173+
multi_json (~> 1.0, >= 1.0.2)
174174
warden (1.2.1)
175175
rack (>= 1.0)
176176
xpath (0.1.4)
@@ -186,10 +186,10 @@ DEPENDENCIES
186186
database_cleaner (>= 0.8.0)
187187
devise (>= 2.1.2)
188188
email_spec (>= 1.2.1)
189-
factory_girl_rails (>= 4.0.0)
189+
factory_girl_rails (>= 4.1.0)
190190
jquery-rails
191191
launchy (>= 2.1.2)
192-
mongoid (>= 3.0.5)
192+
mongoid (>= 3.0.6)
193193
mongoid-rspec (>= 1.4.6)
194194
rails (= 3.2.8)
195195
rspec-rails (>= 2.11.0)

‎app/views/layouts/application.html.erb‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html>
33
<head>
4-
<meta charset="utf-8"/>
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
6-
<title>Rails3 Subdomains</title>
7-
<meta name="description" content=""/>
8-
<meta name="author" content=""/>
9-
<%= stylesheet_link_tag "application", :media => "all" %>
4+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
5+
<title><%= content_for?(:title) ? yield(:title) : "Rails3 Subdomains" %></title>
6+
<meta name="description" content="<%= content_for?(:description) ? yield(:description) : "Rails3 Subdomains" %>">
7+
<%= stylesheet_link_tag "application", :media => "all" %>
108
<%= javascript_include_tag "application" %>
119
<%= csrf_meta_tags %>
10+
<%= yield(:head) %>
1211
</head>
1312
<body>
1413
<div id="container" class="container">

‎spec/spec_helper.rb‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,5 @@
3737
# order dependency and want to debug it, you can fix the order by providing
3838
# the seed, which is printed after each run.
3939
# --seed 1234
40-
config.order = "random"
41-
42-
# Clean up the database
43-
require 'database_cleaner'
44-
config.before(:suite) do
45-
DatabaseCleaner.strategy = :truncation
46-
DatabaseCleaner.orm = "mongoid"
47-
end
48-
49-
config.before(:each) do
50-
DatabaseCleaner.clean
51-
end
52-
40+
config.order = "random"
5341
end

0 commit comments

Comments
 (0)