Skip to content

Commit a04f311

Browse files
committedOct 13, 2015
Merge pull request #3 from TangibleDream/master
Adding rspec
2 parents d43d4af + 77250c1 commit a04f311

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed
 

‎Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ gem 'turbolinks'
2424
gem 'jbuilder', '~> 2.0'
2525
# bundle exec rake doc:rails generates the API under doc/api.
2626
gem 'sdoc', '~> 0.4.0', group: :doc
27+
2728
# Use ActiveModel has_secure_password
2829
# gem 'bcrypt', '~> 3.1.7'
2930
# Use Unicorn as the app server

‎Gemfile.lock

+8-9
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ GEM
4747
sass (>= 3.3.0)
4848
builder (3.2.2)
4949
byebug (6.0.2)
50-
capybara (2.4.4)
50+
capybara (2.5.0)
5151
mime-types (>= 1.16)
5252
nokogiri (>= 1.3.3)
5353
rack (>= 1.0.0)
@@ -61,7 +61,7 @@ GEM
6161
coffee-script-source
6262
execjs
6363
coffee-script-source (1.9.1.1)
64-
database_cleaner (1.4.1)
64+
database_cleaner (1.5.0)
6565
debug_inspector (0.0.2)
6666
diff-lcs (1.2.5)
6767
em-websocket (0.5.1)
@@ -70,8 +70,6 @@ GEM
7070
erubis (2.7.0)
7171
eventmachine (1.0.8)
7272
execjs (2.6.0)
73-
font-awesome-rails (4.4.0.0)
74-
railties (>= 3.2, < 5.0)
7573
factory_girl (4.5.0)
7674
activesupport (>= 3.0.0)
7775
factory_girl_rails (4.5.0)
@@ -80,6 +78,8 @@ GEM
8078
faker (1.5.0)
8179
i18n (~> 0.5)
8280
ffi (1.9.10)
81+
font-awesome-rails (4.4.0.0)
82+
railties (>= 3.2, < 5.0)
8383
formatador (0.2.5)
8484
globalid (0.3.6)
8585
activesupport (>= 4.1.0)
@@ -103,7 +103,7 @@ GEM
103103
rspec (>= 2.99.0, < 4.0)
104104
http_parser.rb (0.6.0)
105105
i18n (0.7.0)
106-
jbuilder (2.3.1)
106+
jbuilder (2.3.2)
107107
activesupport (>= 3.0.0, < 5)
108108
multi_json (~> 1.2)
109109
jquery-rails (4.0.5)
@@ -167,7 +167,6 @@ GEM
167167
rb-inotify (0.9.5)
168168
ffi (>= 0.5.0)
169169
rdoc (4.2.0)
170-
json (~> 1.4)
171170
rspec (3.3.0)
172171
rspec-core (~> 3.3.0)
173172
rspec-expectations (~> 3.3.0)
@@ -189,7 +188,7 @@ GEM
189188
rspec-mocks (~> 3.3.0)
190189
rspec-support (~> 3.3.0)
191190
rspec-support (3.3.0)
192-
sass (3.4.18)
191+
sass (3.4.19)
193192
sass-rails (5.0.4)
194193
railties (>= 4.0.0, < 5.0)
195194
sass (~> 3.1)
@@ -202,7 +201,7 @@ GEM
202201
shellany (0.0.1)
203202
slop (3.6.0)
204203
spring (1.4.0)
205-
sprockets (3.3.5)
204+
sprockets (3.4.0)
206205
rack (> 1, < 3)
207206
sprockets-rails (2.3.3)
208207
actionpack (>= 3.0)
@@ -234,10 +233,10 @@ DEPENDENCIES
234233
byebug
235234
capybara
236235
coffee-rails (~> 4.1.0)
237-
font-awesome-rails (~> 4.4.0.0)
238236
database_cleaner
239237
factory_girl_rails
240238
faker
239+
font-awesome-rails (~> 4.4.0.0)
241240
guard-livereload
242241
guard-rspec
243242
jbuilder (~> 2.0)

0 commit comments

Comments
 (0)
Please sign in to comment.