Skip to content

Commit 920c697

Browse files
committed
Upgraded dependencies.
1 parent bfc44c0 commit 920c697

File tree

4 files changed

+34
-48
lines changed

4 files changed

+34
-48
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rvm:
2-
- 2.5.3
2+
- 2.6.2
33

44
language: ruby
55

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
source 'http://rubygems.org'
22

3-
ruby '2.5.3'
3+
ruby '2.6.2'
44

55
gem 'giphy'
6+
gem 'irb'
67
gem 'jsonpath', '0.9.0'
78
gem 'kaminari-grape'
89
gem 'mongoid'
@@ -12,6 +13,7 @@ gem 'newrelic_rpm'
1213
gem 'rack-robotz'
1314
gem 'rack-server-pages'
1415
gem 'slack-ruby-bot-server'
16+
gem 'unicorn'
1517

1618
group :development, :test do
1719
gem 'foreman'

Gemfile.lock

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activemodel (5.2.2)
5-
activesupport (= 5.2.2)
6-
activesupport (5.2.2)
4+
activemodel (5.2.3)
5+
activesupport (= 5.2.3)
6+
activesupport (5.2.3)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 0.7, < 2)
99
minitest (~> 5.1)
1010
tzinfo (~> 1.1)
1111
addressable (2.6.0)
1212
public_suffix (>= 2.0.2, < 4.0)
1313
ast (2.4.0)
14-
async (1.15.5)
14+
async (1.17.1)
15+
console (~> 1.0)
1516
nio4r (~> 2.3)
1617
timers (~> 4.1)
17-
async-io (1.18.5)
18+
async-io (1.20.0)
1819
async (~> 1.14)
19-
async-websocket (0.7.0)
20+
async-websocket (0.8.0)
2021
async-io
2122
websocket-driver (~> 0.7.0)
2223
axiom-types (0.1.1)
@@ -25,7 +26,7 @@ GEM
2526
thread_safe (~> 0.3, >= 0.3.1)
2627
bson (4.4.2)
2728
builder (3.2.3)
28-
capybara (3.14.0)
29+
capybara (3.16.2)
2930
addressable
3031
mini_mime (>= 0.1.3)
3132
nokogiri (~> 1.8)
@@ -37,7 +38,8 @@ GEM
3738
ffi (~> 1.0, >= 1.0.11)
3839
coercible (1.0.0)
3940
descendants_tracker (~> 0.0.1)
40-
concurrent-ruby (1.1.4)
41+
concurrent-ruby (1.1.5)
42+
console (1.2.1)
4143
crack (0.4.3)
4244
safe_yaml (~> 1.0.0)
4345
database_cleaner (1.7.0)
@@ -97,6 +99,7 @@ GEM
9799
i18n (1.6.0)
98100
concurrent-ruby (~> 1.0)
99101
ice_nine (0.11.2)
102+
irb (1.0.0)
100103
jaro_winkler (1.5.2)
101104
jsonpath (0.9.0)
102105
multi_json
@@ -111,7 +114,7 @@ GEM
111114
mini_mime (1.0.1)
112115
mini_portile2 (2.4.0)
113116
minitest (5.11.3)
114-
mongo (2.7.1)
117+
mongo (2.8.0)
115118
bson (>= 4.4.2, < 5.0.0)
116119
mongoid (7.0.2)
117120
activemodel (>= 5.1, < 6.0.0)
@@ -136,21 +139,20 @@ GEM
136139
newrelic-slack-ruby-bot (0.2.1)
137140
newrelic_rpm
138141
slack-ruby-bot (>= 0.10.5)
139-
newrelic_rpm (6.1.0.352)
142+
newrelic_rpm (6.2.0.354)
140143
nio4r (2.3.1)
141-
nokogiri (1.10.1)
144+
nokogiri (1.10.2)
142145
mini_portile2 (~> 2.4.0)
143-
oj (3.7.9)
144-
parallel (1.14.0)
145-
parser (2.6.0.0)
146+
oj (3.7.12)
147+
parallel (1.17.0)
148+
parser (2.6.2.1)
146149
ast (~> 2.4.0)
147-
powerpack (0.1.2)
148150
psych (3.1.0)
149151
public_suffix (3.0.3)
150-
rack (2.0.6)
152+
rack (2.0.7)
151153
rack-accept (0.4.5)
152154
rack (>= 0.4)
153-
rack-cors (1.0.2)
155+
rack-cors (1.0.3)
154156
rack-rewrite (1.5.1)
155157
rack-robotz (0.0.4)
156158
rack
@@ -161,7 +163,7 @@ GEM
161163
rainbow (3.0.0)
162164
raindrops (0.19.0)
163165
rake (12.3.2)
164-
regexp_parser (1.3.0)
166+
regexp_parser (1.4.0)
165167
representable (3.0.4)
166168
declarative (< 0.1.0)
167169
declarative-option (< 0.2.0)
@@ -181,15 +183,14 @@ GEM
181183
diff-lcs (>= 1.2.0, < 2.0)
182184
rspec-support (~> 3.8.0)
183185
rspec-support (3.8.0)
184-
rubocop (0.65.0)
186+
rubocop (0.67.2)
185187
jaro_winkler (~> 1.5.1)
186188
parallel (~> 1.10)
187189
parser (>= 2.5, != 2.5.1.1)
188-
powerpack (~> 0.1)
189190
psych (>= 3.1.0)
190191
rainbow (>= 2.2.2, < 4.0)
191192
ruby-progressbar (~> 1.7)
192-
unicode-display_width (~> 1.4.0)
193+
unicode-display_width (>= 1.4.0, < 1.6)
193194
ruby-progressbar (1.10.0)
194195
rubyzip (1.2.2)
195196
safe_yaml (1.0.5)
@@ -199,7 +200,7 @@ GEM
199200
slack-ruby-bot (0.12.0)
200201
hashie
201202
slack-ruby-client (>= 0.14.0)
202-
slack-ruby-bot-server (0.9.0)
203+
slack-ruby-bot-server (0.11.0)
203204
async-websocket
204205
foreman
205206
grape
@@ -210,8 +211,7 @@ GEM
210211
rack-rewrite
211212
rack-server-pages
212213
slack-ruby-bot (>= 0.12.0)
213-
unicorn
214-
slack-ruby-client (0.14.1)
214+
slack-ruby-client (0.14.2)
215215
activesupport
216216
faraday (>= 0.9)
217217
faraday_middleware
@@ -225,8 +225,8 @@ GEM
225225
tzinfo (1.2.5)
226226
thread_safe (~> 0.1)
227227
uber (0.1.0)
228-
unicode-display_width (1.4.1)
229-
unicorn (5.4.1)
228+
unicode-display_width (1.5.0)
229+
unicorn (5.5.0)
230230
kgio (~> 2.6)
231231
raindrops (~> 0.7)
232232
uri_template (0.7.0)
@@ -257,6 +257,7 @@ DEPENDENCIES
257257
foreman
258258
giphy
259259
hyperclient
260+
irb
260261
jsonpath (= 0.9.0)
261262
kaminari-grape
262263
mongoid
@@ -272,11 +273,12 @@ DEPENDENCIES
272273
rubocop
273274
selenium-webdriver
274275
slack-ruby-bot-server
276+
unicorn
275277
vcr
276278
webmock
277279

278280
RUBY VERSION
279-
ruby 2.5.3p105
281+
ruby 2.6.2p47
280282

281283
BUNDLED WITH
282-
1.16.6
284+
1.17.2

spec/models/team_spec.rb

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,6 @@
11
require 'spec_helper'
22

33
describe Team do
4-
context '#find_or_create_from_env!' do
5-
before do
6-
ENV['SLACK_API_TOKEN'] = 'token'
7-
end
8-
context 'team', vcr: { cassette_name: 'team_info' } do
9-
it 'creates a team' do
10-
expect { Team.find_or_create_from_env! }.to change(Team, :count).by(1)
11-
team = Team.first
12-
expect(team.team_id).to eq 'T04KB5WQH'
13-
expect(team.name).to eq 'dblock'
14-
expect(team.domain).to eq 'dblockdotorg'
15-
expect(team.token).to eq 'token'
16-
end
17-
end
18-
after do
19-
ENV.delete 'SLACK_API_TOKEN'
20-
end
21-
end
224
context '#purge!' do
235
let!(:active_team) { Fabricate(:team) }
246
let!(:inactive_team) { Fabricate(:team, active: false) }

0 commit comments

Comments
 (0)