Skip to content

Commit e0d78cf

Browse files
authored
Merge pull request #6 from dblock/integration-tests
Integration tests
2 parents 09cd630 + 7de033e commit e0d78cf

File tree

11 files changed

+219
-155
lines changed

11 files changed

+219
-155
lines changed

.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,13 @@ cache: bundler
88
services:
99
- mongodb
1010

11+
addons:
12+
firefox: 54.0
13+
14+
before_install:
15+
- export DISPLAY=:99.0
16+
- sh -e /etc/init.d/xvfb start
17+
- wget https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux64.tar.gz
18+
- mkdir geckodriver
19+
- tar -xzf geckodriver-v0.18.0-linux64.tar.gz -C geckodriver
20+
- export PATH=$PATH:$PWD/geckodriver

Gemfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@ source 'https://rubygems.org'
22

33
ruby '2.3.1'
44

5-
gem 'slack-ruby-bot-server', '~> 0.4.0'
6-
gem 'rack-server-pages', github: 'dblock/rack-server-pages', branch: 'next'
5+
gem 'mongoid'
6+
gem 'mongoid-scroll'
77
gem 'newrelic-slack-ruby-bot'
8+
gem 'slack-ruby-bot-server'
89

910
group :test do
10-
gem 'rake'
11-
gem 'rspec'
11+
gem 'capybara'
12+
gem 'database_cleaner'
1213
gem 'fabrication'
1314
gem 'faker'
15+
gem 'rack-test'
16+
gem 'rake'
17+
gem 'rspec'
18+
gem 'selenium-webdriver'
1419
gem 'vcr'
1520
gem 'webmock'
16-
gem 'database_cleaner'
1721
end

Gemfile.lock

Lines changed: 115 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,28 @@
1-
GIT
2-
remote: git://github.com/dblock/rack-server-pages.git
3-
revision: e77a45f208affed84b02b379b9c4cdb181826a8d
4-
branch: next
5-
specs:
6-
rack-server-pages (0.0.6)
7-
rack
8-
91
GEM
102
remote: https://rubygems.org/
113
specs:
12-
actionpack (5.0.0.1)
13-
actionview (= 5.0.0.1)
14-
activesupport (= 5.0.0.1)
15-
rack (~> 2.0)
16-
rack-test (~> 0.6.3)
17-
rails-dom-testing (~> 2.0)
18-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
19-
actionview (5.0.0.1)
20-
activesupport (= 5.0.0.1)
21-
builder (~> 3.1)
22-
erubis (~> 2.7.0)
23-
rails-dom-testing (~> 2.0)
24-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
25-
activemodel (5.0.0.1)
26-
activesupport (= 5.0.0.1)
27-
activesupport (5.0.0.1)
4+
activemodel (5.1.3)
5+
activesupport (= 5.1.3)
6+
activesupport (5.1.3)
287
concurrent-ruby (~> 1.0, >= 1.0.2)
298
i18n (~> 0.7)
309
minitest (~> 5.1)
3110
tzinfo (~> 1.1)
32-
addressable (2.4.0)
11+
addressable (2.5.1)
12+
public_suffix (~> 2.0, >= 2.0.2)
3313
axiom-types (0.1.1)
3414
descendants_tracker (~> 0.0.4)
3515
ice_nine (~> 0.11.0)
3616
thread_safe (~> 0.3, >= 0.3.1)
37-
bson (4.1.1)
38-
builder (3.2.2)
17+
bson (4.2.2)
18+
builder (3.2.3)
19+
capybara (2.15.1)
20+
addressable
21+
mini_mime (>= 0.1.3)
22+
nokogiri (>= 1.3.3)
23+
rack (>= 1.0.0)
24+
rack-test (>= 0.5.4)
25+
xpath (~> 2.0)
3926
celluloid (0.17.3)
4027
celluloid-essentials
4128
celluloid-extras
@@ -57,150 +44,149 @@ GEM
5744
timers (>= 4.1.1)
5845
celluloid-supervision (0.20.6)
5946
timers (>= 4.1.1)
47+
childprocess (0.7.1)
48+
ffi (~> 1.0, >= 1.0.11)
6049
coercible (1.0.0)
6150
descendants_tracker (~> 0.0.1)
62-
concurrent-ruby (1.0.2)
51+
concurrent-ruby (1.0.5)
6352
crack (0.4.3)
6453
safe_yaml (~> 1.0.0)
65-
database_cleaner (1.5.3)
54+
database_cleaner (1.6.1)
55+
declarative (0.0.9)
56+
declarative-option (0.1.0)
6657
descendants_tracker (0.0.4)
6758
thread_safe (~> 0.3, >= 0.3.1)
68-
diff-lcs (1.2.5)
59+
diff-lcs (1.3)
6960
equalizer (0.0.11)
70-
erubis (2.7.0)
71-
fabrication (2.15.2)
72-
faker (1.6.6)
61+
fabrication (2.16.2)
62+
faker (1.8.4)
7363
i18n (~> 0.5)
74-
faraday (0.9.2)
64+
faraday (0.13.0)
7565
multipart-post (>= 1.2, < 3)
76-
faraday_middleware (0.10.0)
77-
faraday (>= 0.7.4, < 0.10)
78-
foreman (0.82.0)
66+
faraday_middleware (0.12.2)
67+
faraday (>= 0.7.4, < 1.0)
68+
ffi (1.9.18)
69+
foreman (0.84.0)
7970
thor (~> 0.19.1)
80-
gli (2.14.0)
81-
grape (0.18.0)
71+
gli (2.16.1)
72+
grape (1.0.0)
8273
activesupport
8374
builder
84-
hashie (>= 2.1.0)
85-
multi_json (>= 1.3.2)
86-
multi_xml (>= 0.5.2)
87-
mustermann-grape (~> 0.4.0)
75+
mustermann-grape (~> 1.0.0)
8876
rack (>= 1.3.0)
8977
rack-accept
9078
virtus (>= 1.0.0)
91-
grape-roar (0.3.0)
79+
grape-roar (0.4.1)
9280
grape
93-
roar (>= 1.0)
94-
grape-swagger (0.24.0)
95-
grape (>= 0.12.0)
96-
hashdiff (0.3.0)
97-
hashie (3.4.6)
98-
hitimes (1.2.4)
99-
i18n (0.7.0)
81+
multi_json
82+
roar (~> 1.1.0)
83+
grape-swagger (0.27.3)
84+
grape (>= 0.16.2)
85+
hashdiff (0.3.5)
86+
hashie (3.5.6)
87+
hitimes (1.2.6)
88+
i18n (0.8.6)
10089
ice_nine (0.11.2)
101-
json (2.0.2)
102-
kaminari (0.17.0)
103-
actionpack (>= 3.0.0)
104-
activesupport (>= 3.0.0)
105-
kaminari-mongoid (0.1.2)
106-
kaminari
107-
kgio (2.10.0)
108-
loofah (2.0.3)
109-
nokogiri (>= 1.5.9)
110-
mini_portile2 (2.1.0)
111-
minitest (5.9.1)
112-
mongo (2.3.0)
113-
bson (~> 4.1)
114-
mongoid (6.0.2)
115-
activemodel (~> 5.0)
116-
mongo (~> 2.3)
117-
mongoid-compatibility (0.4.0)
90+
json (2.1.0)
91+
kaminari-core (1.0.1)
92+
kaminari-grape (1.0.1)
93+
grape
94+
kaminari-core (~> 1.0)
95+
kgio (2.11.0)
96+
mini_mime (0.1.3)
97+
mini_portile2 (2.2.0)
98+
minitest (5.10.3)
99+
mongo (2.4.3)
100+
bson (>= 4.2.1, < 5.0.0)
101+
mongoid (6.2.1)
102+
activemodel (~> 5.1)
103+
mongo (>= 2.4.1, < 3.0.0)
104+
mongoid-compatibility (0.4.1)
118105
activesupport
119106
mongoid (>= 2.0)
120107
mongoid-scroll (0.3.5)
121108
i18n
122109
mongoid (>= 3.0)
123110
mongoid-compatibility
124111
multi_json (1.12.1)
125-
multi_xml (0.5.5)
126112
multipart-post (2.0.0)
127-
mustermann (0.4.0)
128-
tool (~> 0.2)
129-
mustermann-grape (0.4.0)
130-
mustermann (= 0.4.0)
113+
mustermann (1.0.0)
114+
mustermann-grape (1.0.0)
115+
mustermann (~> 1.0.0)
131116
newrelic-slack-ruby-bot (0.1.0)
132117
newrelic_rpm
133118
slack-ruby-bot
134-
newrelic_rpm (3.17.0.325)
135-
nio4r (1.2.1)
136-
nokogiri (1.6.8.1)
137-
mini_portile2 (~> 2.1.0)
138-
rack (2.0.1)
119+
newrelic_rpm (4.3.0.335)
120+
nio4r (2.1.0)
121+
nokogiri (1.8.0)
122+
mini_portile2 (~> 2.2.0)
123+
public_suffix (2.0.5)
124+
rack (2.0.3)
139125
rack-accept (0.4.5)
140126
rack (>= 0.4)
141-
rack-cors (0.4.0)
127+
rack-cors (1.0.1)
142128
rack-rewrite (1.5.1)
143-
rack-test (0.6.3)
144-
rack (>= 1.0)
145-
rails-dom-testing (2.0.1)
146-
activesupport (>= 4.2.0, < 6.0)
147-
nokogiri (~> 1.6.0)
148-
rails-html-sanitizer (1.0.3)
149-
loofah (~> 2.0)
150-
raindrops (0.17.0)
151-
rake (11.3.0)
152-
representable (2.3.0)
153-
uber (~> 0.0.7)
154-
roar (1.0.4)
155-
representable (>= 2.0.1, < 2.4.0)
156-
rspec (3.5.0)
157-
rspec-core (~> 3.5.0)
158-
rspec-expectations (~> 3.5.0)
159-
rspec-mocks (~> 3.5.0)
160-
rspec-core (3.5.4)
161-
rspec-support (~> 3.5.0)
162-
rspec-expectations (3.5.0)
129+
rack-server-pages (0.1.0)
130+
rack
131+
rack-test (0.7.0)
132+
rack (>= 1.0, < 3)
133+
raindrops (0.19.0)
134+
rake (12.0.0)
135+
representable (3.0.4)
136+
declarative (< 0.1.0)
137+
declarative-option (< 0.2.0)
138+
uber (< 0.2.0)
139+
roar (1.1.0)
140+
representable (~> 3.0.0)
141+
rspec (3.6.0)
142+
rspec-core (~> 3.6.0)
143+
rspec-expectations (~> 3.6.0)
144+
rspec-mocks (~> 3.6.0)
145+
rspec-core (3.6.0)
146+
rspec-support (~> 3.6.0)
147+
rspec-expectations (3.6.0)
163148
diff-lcs (>= 1.2.0, < 2.0)
164-
rspec-support (~> 3.5.0)
165-
rspec-mocks (3.5.0)
149+
rspec-support (~> 3.6.0)
150+
rspec-mocks (3.6.0)
166151
diff-lcs (>= 1.2.0, < 2.0)
167-
rspec-support (~> 3.5.0)
168-
rspec-support (3.5.0)
152+
rspec-support (~> 3.6.0)
153+
rspec-support (3.6.0)
154+
rubyzip (1.2.1)
169155
safe_yaml (1.0.4)
170-
slack-ruby-bot (0.9.0)
156+
selenium-webdriver (3.4.4)
157+
childprocess (~> 0.5)
158+
rubyzip (~> 1.0)
159+
slack-ruby-bot (0.10.4)
171160
hashie
172161
slack-ruby-client (>= 0.6.0)
173-
slack-ruby-bot-server (0.4.0)
162+
slack-ruby-bot-server (0.6.1)
174163
celluloid-io
175164
foreman
176165
grape
177-
grape-roar
166+
grape-roar (>= 0.4.0)
178167
grape-swagger
179-
kaminari-mongoid
180-
mongoid
181-
mongoid-scroll
168+
kaminari-grape
182169
rack-cors
183170
rack-rewrite
184171
rack-server-pages
185172
slack-ruby-bot
186173
unicorn
187-
slack-ruby-client (0.7.7)
174+
slack-ruby-client (0.9.0)
188175
activesupport
189-
faraday
176+
faraday (>= 0.9)
190177
faraday_middleware
191178
gli
192179
hashie
193180
json
194181
websocket-driver
195-
thor (0.19.1)
196-
thread_safe (0.3.5)
197-
timers (4.1.1)
182+
thor (0.19.4)
183+
thread_safe (0.3.6)
184+
timers (4.1.2)
198185
hitimes
199-
tool (0.2.3)
200-
tzinfo (1.2.2)
186+
tzinfo (1.2.3)
201187
thread_safe (~> 0.1)
202-
uber (0.0.15)
203-
unicorn (5.1.0)
188+
uber (0.1.0)
189+
unicorn (5.3.0)
204190
kgio (~> 2.6)
205191
raindrops (~> 0.7)
206192
vcr (3.0.3)
@@ -209,31 +195,37 @@ GEM
209195
coercible (~> 1.0)
210196
descendants_tracker (~> 0.0, >= 0.0.3)
211197
equalizer (~> 0.0, >= 0.0.9)
212-
webmock (2.1.0)
198+
webmock (3.0.1)
213199
addressable (>= 2.3.6)
214200
crack (>= 0.3.2)
215201
hashdiff
216-
websocket-driver (0.6.4)
202+
websocket-driver (0.6.5)
217203
websocket-extensions (>= 0.1.0)
218204
websocket-extensions (0.1.2)
205+
xpath (2.1.0)
206+
nokogiri (~> 1.3)
219207

220208
PLATFORMS
221209
ruby
222210

223211
DEPENDENCIES
212+
capybara
224213
database_cleaner
225214
fabrication
226215
faker
216+
mongoid
217+
mongoid-scroll
227218
newrelic-slack-ruby-bot
228-
rack-server-pages!
219+
rack-test
229220
rake
230221
rspec
231-
slack-ruby-bot-server (~> 0.4.0)
222+
selenium-webdriver
223+
slack-ruby-bot-server
232224
vcr
233225
webmock
234226

235227
RUBY VERSION
236228
ruby 2.3.1p112
237229

238230
BUNDLED WITH
239-
1.13.6
231+
1.14.6

config.ru

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ require_relative 'commands'
66

77
Mongoid.load!(File.expand_path('config/mongoid.yml', __dir__), ENV['RACK_ENV'])
88

9-
if ENV['RACK_ENV'] == 'development'
10-
puts 'Loading NewRelic in developer mode ...'
11-
require 'new_relic/rack/developer_mode'
12-
use NewRelic::Rack::DeveloperMode
13-
end
14-
159
NewRelic::Agent.manual_start
1610

1711
SlackRubyBotServer::App.instance.prepare!

0 commit comments

Comments
 (0)