Skip to content

Commit 858360f

Browse files
authored
Merge pull request #70 from katylouise/katylouise/webdev-956_procedure-step-work-packages-current
[WEBDEV-956] Added route for procedure steps work packages current
2 parents 79547b5 + 5d6eef6 commit 858360f

File tree

4 files changed

+72
-65
lines changed

4 files changed

+72
-65
lines changed

Gemfile.lock

Lines changed: 65 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
PATH
22
remote: .
33
specs:
4-
parliament-routes (0.6.22)
4+
parliament-routes (0.6.23)
55

66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
actioncable (5.2.0)
10-
actionpack (= 5.2.0)
9+
actioncable (5.2.1)
10+
actionpack (= 5.2.1)
1111
nio4r (~> 2.0)
1212
websocket-driver (>= 0.6.1)
13-
actionmailer (5.2.0)
14-
actionpack (= 5.2.0)
15-
actionview (= 5.2.0)
16-
activejob (= 5.2.0)
13+
actionmailer (5.2.1)
14+
actionpack (= 5.2.1)
15+
actionview (= 5.2.1)
16+
activejob (= 5.2.1)
1717
mail (~> 2.5, >= 2.5.4)
1818
rails-dom-testing (~> 2.0)
19-
actionpack (5.2.0)
20-
actionview (= 5.2.0)
21-
activesupport (= 5.2.0)
19+
actionpack (5.2.1)
20+
actionview (= 5.2.1)
21+
activesupport (= 5.2.1)
2222
rack (~> 2.0)
2323
rack-test (>= 0.6.3)
2424
rails-dom-testing (~> 2.0)
2525
rails-html-sanitizer (~> 1.0, >= 1.0.2)
26-
actionview (5.2.0)
27-
activesupport (= 5.2.0)
26+
actionview (5.2.1)
27+
activesupport (= 5.2.1)
2828
builder (~> 3.1)
2929
erubi (~> 1.4)
3030
rails-dom-testing (~> 2.0)
3131
rails-html-sanitizer (~> 1.0, >= 1.0.3)
32-
activejob (5.2.0)
33-
activesupport (= 5.2.0)
32+
activejob (5.2.1)
33+
activesupport (= 5.2.1)
3434
globalid (>= 0.3.6)
35-
activemodel (5.2.0)
36-
activesupport (= 5.2.0)
37-
activerecord (5.2.0)
38-
activemodel (= 5.2.0)
39-
activesupport (= 5.2.0)
35+
activemodel (5.2.1)
36+
activesupport (= 5.2.1)
37+
activerecord (5.2.1)
38+
activemodel (= 5.2.1)
39+
activesupport (= 5.2.1)
4040
arel (>= 9.0)
41-
activestorage (5.2.0)
42-
actionpack (= 5.2.0)
43-
activerecord (= 5.2.0)
41+
activestorage (5.2.1)
42+
actionpack (= 5.2.1)
43+
activerecord (= 5.2.1)
4444
marcel (~> 0.3.1)
45-
activesupport (5.2.0)
45+
activesupport (5.2.1)
4646
concurrent-ruby (~> 1.0, >= 1.0.2)
4747
i18n (>= 0.7, < 2)
4848
minitest (~> 5.1)
@@ -51,82 +51,84 @@ GEM
5151
public_suffix (>= 2.0.2, < 4.0)
5252
arel (9.0.0)
5353
builder (3.2.3)
54-
capybara (3.3.1)
54+
capybara (3.10.1)
5555
addressable
5656
mini_mime (>= 0.1.3)
5757
nokogiri (~> 1.8)
5858
rack (>= 1.6.0)
5959
rack-test (>= 0.6.3)
60-
xpath (~> 3.1)
61-
concurrent-ruby (1.0.5)
60+
regexp_parser (~> 1.2)
61+
xpath (~> 3.2)
62+
concurrent-ruby (1.1.3)
6263
crass (1.0.4)
6364
diff-lcs (1.3)
6465
erubi (1.7.1)
6566
globalid (0.4.1)
6667
activesupport (>= 4.2.0)
67-
i18n (1.0.1)
68+
i18n (1.1.1)
6869
concurrent-ruby (~> 1.0)
69-
loofah (2.2.2)
70+
loofah (2.2.3)
7071
crass (~> 1.0.2)
7172
nokogiri (>= 1.5.9)
72-
mail (2.7.0)
73+
mail (2.7.1)
7374
mini_mime (>= 0.1.1)
74-
marcel (0.3.2)
75+
marcel (0.3.3)
7576
mimemagic (~> 0.3.2)
76-
method_source (0.9.0)
77+
method_source (0.9.1)
7778
mimemagic (0.3.2)
78-
mini_mime (1.0.0)
79+
mini_mime (1.0.1)
7980
mini_portile2 (2.3.0)
8081
minitest (5.11.3)
8182
nio4r (2.3.1)
82-
nokogiri (1.8.4)
83+
nokogiri (1.8.5)
8384
mini_portile2 (~> 2.3.0)
84-
public_suffix (3.0.2)
85-
rack (2.0.5)
85+
public_suffix (3.0.3)
86+
rack (2.0.6)
8687
rack-test (1.1.0)
8788
rack (>= 1.0, < 3)
88-
rails (5.2.0)
89-
actioncable (= 5.2.0)
90-
actionmailer (= 5.2.0)
91-
actionpack (= 5.2.0)
92-
actionview (= 5.2.0)
93-
activejob (= 5.2.0)
94-
activemodel (= 5.2.0)
95-
activerecord (= 5.2.0)
96-
activestorage (= 5.2.0)
97-
activesupport (= 5.2.0)
89+
rails (5.2.1)
90+
actioncable (= 5.2.1)
91+
actionmailer (= 5.2.1)
92+
actionpack (= 5.2.1)
93+
actionview (= 5.2.1)
94+
activejob (= 5.2.1)
95+
activemodel (= 5.2.1)
96+
activerecord (= 5.2.1)
97+
activestorage (= 5.2.1)
98+
activesupport (= 5.2.1)
9899
bundler (>= 1.3.0)
99-
railties (= 5.2.0)
100+
railties (= 5.2.1)
100101
sprockets-rails (>= 2.0.0)
101102
rails-dom-testing (2.0.3)
102103
activesupport (>= 4.2.0)
103104
nokogiri (>= 1.6)
104105
rails-html-sanitizer (1.0.4)
105106
loofah (~> 2.2, >= 2.2.2)
106-
railties (5.2.0)
107-
actionpack (= 5.2.0)
108-
activesupport (= 5.2.0)
107+
railties (5.2.1)
108+
actionpack (= 5.2.1)
109+
activesupport (= 5.2.1)
109110
method_source
110111
rake (>= 0.8.7)
111-
thor (>= 0.18.1, < 2.0)
112+
thor (>= 0.19.0, < 2.0)
112113
rake (12.3.1)
113-
rspec-core (3.7.1)
114-
rspec-support (~> 3.7.0)
115-
rspec-expectations (3.7.0)
114+
regexp_parser (1.2.0)
115+
rspec-core (3.8.0)
116+
rspec-support (~> 3.8.0)
117+
rspec-expectations (3.8.2)
116118
diff-lcs (>= 1.2.0, < 2.0)
117-
rspec-support (~> 3.7.0)
118-
rspec-mocks (3.7.0)
119+
rspec-support (~> 3.8.0)
120+
rspec-mocks (3.8.0)
119121
diff-lcs (>= 1.2.0, < 2.0)
120-
rspec-support (~> 3.7.0)
121-
rspec-rails (3.7.2)
122+
rspec-support (~> 3.8.0)
123+
rspec-rails (3.8.1)
122124
actionpack (>= 3.0)
123125
activesupport (>= 3.0)
124126
railties (>= 3.0)
125-
rspec-core (~> 3.7.0)
126-
rspec-expectations (~> 3.7.0)
127-
rspec-mocks (~> 3.7.0)
128-
rspec-support (~> 3.7.0)
129-
rspec-support (3.7.1)
127+
rspec-core (~> 3.8.0)
128+
rspec-expectations (~> 3.8.0)
129+
rspec-mocks (~> 3.8.0)
130+
rspec-support (~> 3.8.0)
131+
rspec-support (3.8.0)
130132
sprockets (3.7.2)
131133
concurrent-ruby (~> 1.0)
132134
rack (> 1, < 3)
@@ -142,7 +144,7 @@ GEM
142144
websocket-driver (0.7.0)
143145
websocket-extensions (>= 0.1.0)
144146
websocket-extensions (0.1.3)
145-
xpath (3.1.0)
147+
xpath (3.2.0)
146148
nokogiri (~> 1.8)
147149

148150
PLATFORMS

config/routes.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,11 @@
564564
# /procedure-steps/:procedure_step_id/work-packages
565565
scope '/work-packages', as: 'work_packages' do
566566
get '/', to: 'procedure_steps/work_packages#index'
567+
568+
# /procedure-steps/:procedure_step_id/work-packages/current
569+
scope '/current', as: 'current' do
570+
get '/', to: 'procedure_steps/work_packages#current'
571+
end
567572
end
568573
end
569574
end

lib/parliament/engine/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Parliament
22
module Engine
3-
VERSION = '0.6.22'.freeze
3+
VERSION = '0.6.23'.freeze
44
end
55
end

spec/router_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
RSpec.describe 'routing' do
44
it 'should have a specific number of routes inherited from the engine' do
55
# routes.rb currently has 200 routes, 2 routes exist on top of this in dummy application
6-
expect(Rails.application.routes.routes.size).to eq(211)
6+
expect(Rails.application.routes.routes.size).to eq(212)
77
end
88
end

0 commit comments

Comments
 (0)