Skip to content

Commit 2b74f31

Browse files
jonasjabarijonasjabari
authored
Merge pull request #546 from matestack/fix_local_test_env
Fix local test env
2 parents 6ca9435 + 4824176 commit 2b74f31

File tree

15 files changed

+94
-357
lines changed

15 files changed

+94
-357
lines changed

‎Dockerfile.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM ruby:3.0-alpine3.12
1+
FROM ruby:2.7.2-alpine3.12
22

33
RUN gem install bundler:2.1.4
44

55
RUN apk update --no-cache && \
6-
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev && \
6+
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm && \
77
mkdir -p /app
88

99
WORKDIR /app

‎Gemfile.lock

Lines changed: 68 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -7,60 +7,60 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
actioncable (6.1.1)
11-
actionpack (= 6.1.1)
12-
activesupport (= 6.1.1)
10+
actioncable (6.1.3.2)
11+
actionpack (= 6.1.3.2)
12+
activesupport (= 6.1.3.2)
1313
nio4r (~> 2.0)
1414
websocket-driver (>= 0.6.1)
15-
actionmailbox (6.1.1)
16-
actionpack (= 6.1.1)
17-
activejob (= 6.1.1)
18-
activerecord (= 6.1.1)
19-
activestorage (= 6.1.1)
20-
activesupport (= 6.1.1)
15+
actionmailbox (6.1.3.2)
16+
actionpack (= 6.1.3.2)
17+
activejob (= 6.1.3.2)
18+
activerecord (= 6.1.3.2)
19+
activestorage (= 6.1.3.2)
20+
activesupport (= 6.1.3.2)
2121
mail (>= 2.7.1)
22-
actionmailer (6.1.1)
23-
actionpack (= 6.1.1)
24-
actionview (= 6.1.1)
25-
activejob (= 6.1.1)
26-
activesupport (= 6.1.1)
22+
actionmailer (6.1.3.2)
23+
actionpack (= 6.1.3.2)
24+
actionview (= 6.1.3.2)
25+
activejob (= 6.1.3.2)
26+
activesupport (= 6.1.3.2)
2727
mail (~> 2.5, >= 2.5.4)
2828
rails-dom-testing (~> 2.0)
29-
actionpack (6.1.1)
30-
actionview (= 6.1.1)
31-
activesupport (= 6.1.1)
29+
actionpack (6.1.3.2)
30+
actionview (= 6.1.3.2)
31+
activesupport (= 6.1.3.2)
3232
rack (~> 2.0, >= 2.0.9)
3333
rack-test (>= 0.6.3)
3434
rails-dom-testing (~> 2.0)
3535
rails-html-sanitizer (~> 1.0, >= 1.2.0)
36-
actiontext (6.1.1)
37-
actionpack (= 6.1.1)
38-
activerecord (= 6.1.1)
39-
activestorage (= 6.1.1)
40-
activesupport (= 6.1.1)
36+
actiontext (6.1.3.2)
37+
actionpack (= 6.1.3.2)
38+
activerecord (= 6.1.3.2)
39+
activestorage (= 6.1.3.2)
40+
activesupport (= 6.1.3.2)
4141
nokogiri (>= 1.8.5)
42-
actionview (6.1.1)
43-
activesupport (= 6.1.1)
42+
actionview (6.1.3.2)
43+
activesupport (= 6.1.3.2)
4444
builder (~> 3.1)
4545
erubi (~> 1.4)
4646
rails-dom-testing (~> 2.0)
4747
rails-html-sanitizer (~> 1.1, >= 1.2.0)
48-
activejob (6.1.1)
49-
activesupport (= 6.1.1)
48+
activejob (6.1.3.2)
49+
activesupport (= 6.1.3.2)
5050
globalid (>= 0.3.6)
51-
activemodel (6.1.1)
52-
activesupport (= 6.1.1)
53-
activerecord (6.1.1)
54-
activemodel (= 6.1.1)
55-
activesupport (= 6.1.1)
56-
activestorage (6.1.1)
57-
actionpack (= 6.1.1)
58-
activejob (= 6.1.1)
59-
activerecord (= 6.1.1)
60-
activesupport (= 6.1.1)
61-
marcel (~> 0.3.1)
62-
mimemagic (~> 0.3.2)
63-
activesupport (6.1.1)
51+
activemodel (6.1.3.2)
52+
activesupport (= 6.1.3.2)
53+
activerecord (6.1.3.2)
54+
activemodel (= 6.1.3.2)
55+
activesupport (= 6.1.3.2)
56+
activestorage (6.1.3.2)
57+
actionpack (= 6.1.3.2)
58+
activejob (= 6.1.3.2)
59+
activerecord (= 6.1.3.2)
60+
activesupport (= 6.1.3.2)
61+
marcel (~> 1.0.0)
62+
mini_mime (~> 1.0.2)
63+
activesupport (6.1.3.2)
6464
concurrent-ruby (~> 1.0, >= 1.0.2)
6565
i18n (>= 1.6, < 2)
6666
minitest (>= 5.1)
@@ -85,31 +85,27 @@ GEM
8585
rexml
8686
crass (1.0.6)
8787
diff-lcs (1.4.4)
88-
docile (1.3.5)
88+
docile (1.4.0)
8989
erubi (1.10.0)
9090
generator_spec (0.9.4)
9191
activesupport (>= 3.0.0)
9292
railties (>= 3.0.0)
9393
globalid (0.4.2)
9494
activesupport (>= 4.2.0)
9595
hashdiff (1.0.1)
96-
i18n (1.8.8)
96+
i18n (1.8.10)
9797
concurrent-ruby (~> 1.0)
98-
loofah (2.9.0)
98+
loofah (2.9.1)
9999
crass (~> 1.0.2)
100100
nokogiri (>= 1.5.9)
101101
mail (2.7.1)
102102
mini_mime (>= 0.1.1)
103-
marcel (0.3.3)
104-
mimemagic (~> 0.3.2)
103+
marcel (1.0.1)
105104
method_source (1.0.0)
106-
mimemagic (0.3.5)
107-
mini_mime (1.0.2)
108-
mini_portile2 (2.5.0)
109-
minitest (5.14.3)
110-
nio4r (2.5.4)
111-
nokogiri (1.11.1)
112-
mini_portile2 (~> 2.5.0)
105+
mini_mime (1.0.3)
106+
minitest (5.14.4)
107+
nio4r (2.5.7)
108+
nokogiri (1.11.4-x86_64-linux)
113109
racc (~> 1.4)
114110
pg (1.2.3)
115111
pry (0.13.1)
@@ -121,43 +117,43 @@ GEM
121117
pry-rails (0.3.9)
122118
pry (>= 0.10.4)
123119
public_suffix (4.0.6)
124-
puma (5.2.0)
120+
puma (5.3.1)
125121
nio4r (~> 2.0)
126122
racc (1.5.2)
127123
rack (2.2.3)
128124
rack-proxy (0.6.5)
129125
rack
130126
rack-test (1.1.0)
131127
rack (>= 1.0, < 3)
132-
rails (6.1.1)
133-
actioncable (= 6.1.1)
134-
actionmailbox (= 6.1.1)
135-
actionmailer (= 6.1.1)
136-
actionpack (= 6.1.1)
137-
actiontext (= 6.1.1)
138-
actionview (= 6.1.1)
139-
activejob (= 6.1.1)
140-
activemodel (= 6.1.1)
141-
activerecord (= 6.1.1)
142-
activestorage (= 6.1.1)
143-
activesupport (= 6.1.1)
128+
rails (6.1.3.2)
129+
actioncable (= 6.1.3.2)
130+
actionmailbox (= 6.1.3.2)
131+
actionmailer (= 6.1.3.2)
132+
actionpack (= 6.1.3.2)
133+
actiontext (= 6.1.3.2)
134+
actionview (= 6.1.3.2)
135+
activejob (= 6.1.3.2)
136+
activemodel (= 6.1.3.2)
137+
activerecord (= 6.1.3.2)
138+
activestorage (= 6.1.3.2)
139+
activesupport (= 6.1.3.2)
144140
bundler (>= 1.15.0)
145-
railties (= 6.1.1)
141+
railties (= 6.1.3.2)
146142
sprockets-rails (>= 2.0.0)
147143
rails-dom-testing (2.0.3)
148144
activesupport (>= 4.2.0)
149145
nokogiri (>= 1.6)
150146
rails-html-sanitizer (1.3.0)
151147
loofah (~> 2.3)
152-
railties (6.1.1)
153-
actionpack (= 6.1.1)
154-
activesupport (= 6.1.1)
148+
railties (6.1.3.2)
149+
actionpack (= 6.1.3.2)
150+
activesupport (= 6.1.3.2)
155151
method_source
156152
rake (>= 0.8.7)
157153
thor (~> 1.0)
158154
rake (13.0.3)
159-
regexp_parser (2.0.3)
160-
rexml (3.2.4)
155+
regexp_parser (2.1.1)
156+
rexml (3.2.5)
161157
rspec-core (3.10.1)
162158
rspec-support (~> 3.10.0)
163159
rspec-expectations (3.10.1)
@@ -184,7 +180,7 @@ GEM
184180
simplecov-html (~> 0.11)
185181
simplecov_json_formatter (~> 0.1)
186182
simplecov-html (0.12.3)
187-
simplecov_json_formatter (0.1.2)
183+
simplecov_json_formatter (0.1.3)
188184
sprockets (4.0.2)
189185
concurrent-ruby (~> 1.0)
190186
rack (> 1, < 3)
@@ -195,7 +191,7 @@ GEM
195191
thor (1.1.0)
196192
tzinfo (2.0.4)
197193
concurrent-ruby (~> 1.0)
198-
webmock (3.11.2)
194+
webmock (3.13.0)
199195
addressable (>= 2.3.6)
200196
crack (>= 0.3.2)
201197
hashdiff (>= 0.4.0, < 2.0.0)

‎spec/dummy/app/controllers/my_app_controller.rb

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎spec/dummy/app/controllers/sandbox/sandbox_controller.rb

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎spec/dummy/app/matestack/app.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# used within specs only
12
class App < Matestack::Ui::App
23

34
def response

‎spec/dummy/app/matestack/demo/app.rb

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
class Demo::App < Matestack::Ui::App
22

33
def response
4-
html do
5-
head do
6-
unescape csrf_meta_tags
7-
unescape javascript_pack_tag('application')
8-
end
9-
body do
10-
matestack do
11-
h1 'App'
12-
yield
13-
end
14-
end
15-
end
4+
h1 'App'
5+
yield
166
end
177

18-
end
8+
end

0 commit comments

Comments
 (0)