taverna-player 0.8.0 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/.travis.yml +6 -0
- data/CHANGES.rdoc +28 -0
- data/CITATION +20 -0
- data/Gemfile +0 -12
- data/README.rdoc +30 -16
- data/Rakefile +1 -0
- data/app/controllers/taverna_player/workflows_controller.rb +18 -0
- data/app/helpers/taverna_player/application_helper.rb +2 -2
- data/app/models/taverna_player/run.rb +35 -3
- data/app/models/taverna_player/workflow.rb +41 -0
- data/app/views/taverna_player/workflows/_info.json.jbuilder +1 -0
- data/{test/dummy/app/views → app/views/taverna_player}/workflows/index.html.erb +1 -1
- data/app/views/taverna_player/workflows/index.json.jbuilder +1 -0
- data/config/routes.rb +9 -0
- data/db/migrate/20140917165505_create_taverna_player_workflows.rb +12 -0
- data/lib/generators/taverna_player/controllers_generator.rb +5 -6
- data/lib/generators/taverna_player/models_generator.rb +3 -3
- data/lib/generators/templates/callbacks/worker_callbacks.rb +5 -5
- data/{test/dummy/app → lib/generators/templates}/controllers/workflows_controller.rb +7 -4
- data/{test/dummy/test/functional/workflows_controller_test.rb → lib/generators/templates/models/workflow.rb} +6 -7
- data/lib/generators/templates/player_initializer.rb +5 -4
- data/lib/taverna-player.rb +11 -1
- data/lib/taverna_player/concerns/controllers/runs_controller.rb +1 -1
- data/lib/taverna_player/concerns/controllers/workflows_controller.rb +41 -0
- data/lib/taverna_player/concerns/models/run.rb +42 -14
- data/lib/taverna_player/concerns/models/run_port.rb +2 -1
- data/lib/taverna_player/concerns/models/workflow.rb +44 -0
- data/lib/taverna_player/model_proxy.rb +14 -8
- data/lib/taverna_player/version.rb +1 -1
- data/taverna_player.gemspec +1 -0
- data/test/dummy/app/views/layouts/application.html.erb +1 -1
- data/test/dummy/config/initializers/taverna_player.rb +1 -4
- data/test/dummy/config/routes.rb +1 -7
- data/test/dummy/db/migrate/20140917165846_drop_workflows.rb +9 -0
- data/test/dummy/db/migrate/20140917170017_create_taverna_player_workflows.taverna_player.rb +13 -0
- data/test/dummy/db/schema.rb +9 -9
- data/test/dummy/lib/callbacks.rb +4 -4
- data/test/fixtures/delayed_jobs.yml +45 -0
- data/test/fixtures/taverna_player/interactions.yml +3 -3
- data/test/fixtures/taverna_player/run_ports.yml +7 -12
- data/test/fixtures/taverna_player/runs.yml +43 -13
- data/test/fixtures/{workflows.yml → taverna_player/workflows.yml} +1 -4
- data/test/fixtures/users.yml +2 -3
- data/test/functional/taverna_player/runs_controller_test.rb +42 -15
- data/test/functional/taverna_player/workflows_controller_test.rb +37 -0
- data/test/unit/helpers/taverna_player/application_helper_test.rb +1 -1
- data/test/unit/taverna_player/interaction_test.rb +2 -2
- data/test/unit/taverna_player/model_proxy_test.rb +58 -0
- data/test/unit/taverna_player/run_test.rb +103 -23
- data/test/unit/taverna_player/worker_test.rb +2 -0
- metadata +39 -12
- data/test/dummy/app/models/workflow.rb +0 -32
@@ -0,0 +1,37 @@
|
|
1
|
+
#------------------------------------------------------------------------------
|
2
|
+
# Copyright (c) 2013, 2014 The University of Manchester, UK.
|
3
|
+
#
|
4
|
+
# BSD Licenced. See LICENCE.rdoc for details.
|
5
|
+
#
|
6
|
+
# Taverna Player was developed in the BioVeL project, funded by the European
|
7
|
+
# Commission 7th Framework Programme (FP7), through grant agreement
|
8
|
+
# number 283359.
|
9
|
+
#
|
10
|
+
# Author: Robert Haines
|
11
|
+
#------------------------------------------------------------------------------
|
12
|
+
|
13
|
+
require 'test_helper'
|
14
|
+
|
15
|
+
module TavernaPlayer
|
16
|
+
class WorkflowsControllerTest < ActionController::TestCase
|
17
|
+
setup do
|
18
|
+
@routes = TavernaPlayer::Engine.routes
|
19
|
+
end
|
20
|
+
|
21
|
+
test "should route to workflows" do
|
22
|
+
assert_routing "/workflows",
|
23
|
+
{ :controller => "taverna_player/workflows", :action => "index" }, {},
|
24
|
+
{}, "Did not route correctly"
|
25
|
+
end
|
26
|
+
|
27
|
+
test "should get index html" do
|
28
|
+
get :index
|
29
|
+
assert_response :success
|
30
|
+
end
|
31
|
+
|
32
|
+
test "should get index json" do
|
33
|
+
get :index, :format => :json
|
34
|
+
assert_response :success
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
@@ -16,7 +16,7 @@ module TavernaPlayer
|
|
16
16
|
class ApplicationHelperTest < ActionView::TestCase
|
17
17
|
setup do
|
18
18
|
@run = taverna_player_runs(:one)
|
19
|
-
@workflow =
|
19
|
+
@workflow = taverna_player_workflows(:one)
|
20
20
|
end
|
21
21
|
|
22
22
|
test "should output embedded run path from id" do
|
@@ -1,5 +1,5 @@
|
|
1
1
|
#------------------------------------------------------------------------------
|
2
|
-
# Copyright (c) 2013 The University of Manchester, UK.
|
2
|
+
# Copyright (c) 2013, 2014 The University of Manchester, UK.
|
3
3
|
#
|
4
4
|
# BSD Licenced. See LICENCE.rdoc for details.
|
5
5
|
#
|
@@ -22,7 +22,7 @@ module TavernaPlayer
|
|
22
22
|
test "should not allow two identical serial numbers for the same run" do
|
23
23
|
int = Interaction.new
|
24
24
|
int.serial = "ask0"
|
25
|
-
int.
|
25
|
+
int.run = taverna_player_runs(:four)
|
26
26
|
refute int.save, "Saved the interaction with a non-unique serial number"
|
27
27
|
end
|
28
28
|
|
@@ -0,0 +1,58 @@
|
|
1
|
+
#------------------------------------------------------------------------------
|
2
|
+
# Copyright (c) 2014 The University of Manchester, UK.
|
3
|
+
#
|
4
|
+
# BSD Licenced. See LICENCE.rdoc for details.
|
5
|
+
#
|
6
|
+
# Taverna Player was developed in the BioVeL project, funded by the European
|
7
|
+
# Commission 7th Framework Programme (FP7), through grant agreement
|
8
|
+
# number 283359.
|
9
|
+
#
|
10
|
+
# Author: Robert Haines
|
11
|
+
#------------------------------------------------------------------------------
|
12
|
+
|
13
|
+
require 'test_helper'
|
14
|
+
|
15
|
+
class NameTest
|
16
|
+
def proxy_method
|
17
|
+
1
|
18
|
+
end
|
19
|
+
end
|
20
|
+
|
21
|
+
class ModelProxyTest < ActiveSupport::TestCase
|
22
|
+
|
23
|
+
setup do
|
24
|
+
@name = "NameTest"
|
25
|
+
@rooted_name = "::#{@name}"
|
26
|
+
@constant = ::NameTest
|
27
|
+
@methods = [ :test1, :test2 ]
|
28
|
+
end
|
29
|
+
|
30
|
+
test "name is rooted" do
|
31
|
+
mp = TavernaPlayer::ModelProxy.new(@name)
|
32
|
+
|
33
|
+
assert_equal @rooted_name, mp.class_name
|
34
|
+
assert_equal @constant, mp.class_const
|
35
|
+
end
|
36
|
+
|
37
|
+
test "already rooted name" do
|
38
|
+
mp = TavernaPlayer::ModelProxy.new(@rooted_name)
|
39
|
+
|
40
|
+
assert_equal @rooted_name, mp.class_name
|
41
|
+
assert_equal @constant, mp.class_const
|
42
|
+
end
|
43
|
+
|
44
|
+
test "proxy methods" do
|
45
|
+
mp = TavernaPlayer::ModelProxy.new(@name, @methods)
|
46
|
+
|
47
|
+
@methods.each do |method|
|
48
|
+
setter = "#{method}_method_name=".to_sym
|
49
|
+
assert mp.respond_to?(method)
|
50
|
+
assert mp.respond_to?(setter)
|
51
|
+
|
52
|
+
# Set the proxy method, then call it.
|
53
|
+
mp.send(setter, :proxy_method)
|
54
|
+
assert_equal 1, mp.send(method, NameTest.new)
|
55
|
+
end
|
56
|
+
end
|
57
|
+
|
58
|
+
end
|
@@ -1,5 +1,5 @@
|
|
1
1
|
#------------------------------------------------------------------------------
|
2
|
-
# Copyright (c) 2013 The University of Manchester, UK.
|
2
|
+
# Copyright (c) 2013, 2014 The University of Manchester, UK.
|
3
3
|
#
|
4
4
|
# BSD Licenced. See LICENCE.rdoc for details.
|
5
5
|
#
|
@@ -14,9 +14,24 @@ require 'test_helper'
|
|
14
14
|
|
15
15
|
module TavernaPlayer
|
16
16
|
class RunTest < ActiveSupport::TestCase
|
17
|
+
|
18
|
+
setup do
|
19
|
+
@run1 = taverna_player_runs(:one)
|
20
|
+
@run2 = taverna_player_runs(:two)
|
21
|
+
@run3 = taverna_player_runs(:three)
|
22
|
+
@run4 = taverna_player_runs(:four)
|
23
|
+
@run5 = taverna_player_runs(:five)
|
24
|
+
@run6 = taverna_player_runs(:six)
|
25
|
+
@run8 = taverna_player_runs(:eight)
|
26
|
+
@run9 = taverna_player_runs(:nine)
|
27
|
+
@run10 = taverna_player_runs(:ten)
|
28
|
+
@run11 = taverna_player_runs(:eleven)
|
29
|
+
@workflow = taverna_player_workflows(:one)
|
30
|
+
end
|
31
|
+
|
17
32
|
test "should not save run with an illegal state" do
|
18
33
|
run = Run.new
|
19
|
-
run.workflow =
|
34
|
+
run.workflow = @workflow
|
20
35
|
run.state = :not_a_state
|
21
36
|
assert !run.save, "Saved the run with an illegal state"
|
22
37
|
end
|
@@ -37,7 +52,7 @@ module TavernaPlayer
|
|
37
52
|
|
38
53
|
test "should not save run with cancelled state if not marked as stopped" do
|
39
54
|
run = Run.new
|
40
|
-
run.workflow =
|
55
|
+
run.workflow = @workflow
|
41
56
|
run.saved_state = "cancelled"
|
42
57
|
run.stop = false
|
43
58
|
refute run.save, "Saved run with cancelled state when not stopped first"
|
@@ -45,7 +60,7 @@ module TavernaPlayer
|
|
45
60
|
|
46
61
|
test "should cancel run if run set to stop first" do
|
47
62
|
run = Run.new
|
48
|
-
run.workflow =
|
63
|
+
run.workflow = @workflow
|
49
64
|
refute run.stop, "Run's stop flag was set upon creation"
|
50
65
|
run.cancel
|
51
66
|
run.state = :cancelled
|
@@ -56,7 +71,7 @@ module TavernaPlayer
|
|
56
71
|
|
57
72
|
test "should not be able to set state to cancelling directly" do
|
58
73
|
run = Run.new
|
59
|
-
run.workflow =
|
74
|
+
run.workflow = @workflow
|
60
75
|
assert run.save, "Could not save run initially"
|
61
76
|
|
62
77
|
run.state = :cancelling
|
@@ -65,7 +80,7 @@ module TavernaPlayer
|
|
65
80
|
|
66
81
|
test "should be in cancelling state after being cancelled" do
|
67
82
|
run = Run.new
|
68
|
-
run.workflow =
|
83
|
+
run.workflow = @workflow
|
69
84
|
run.state = :running
|
70
85
|
assert run.save, "Could not save run initially."
|
71
86
|
run.delayed_job_id = nil # Remove delayed job to pretend it is running.
|
@@ -96,35 +111,39 @@ module TavernaPlayer
|
|
96
111
|
end
|
97
112
|
|
98
113
|
test "complete run states" do
|
99
|
-
refute
|
100
|
-
refute
|
101
|
-
assert
|
102
|
-
refute
|
103
|
-
refute
|
104
|
-
assert
|
114
|
+
refute @run1.complete?, "Run not complete"
|
115
|
+
refute @run2.complete?, "Run not complete"
|
116
|
+
assert @run3.complete?, "Run is complete"
|
117
|
+
refute @run4.complete?, "Run not complete"
|
118
|
+
refute @run5.complete?, "Run not complete"
|
119
|
+
assert @run6.complete?, "Run is complete"
|
120
|
+
refute @run8.complete?, "Run not complete"
|
121
|
+
assert @run9.complete?, "Run is complete"
|
122
|
+
assert @run10.complete?, "Run is complete"
|
123
|
+
refute @run11.complete?, "Run not complete"
|
105
124
|
end
|
106
125
|
|
107
126
|
test "a parent cannot be younger than its child" do
|
108
|
-
older = Run.create(:workflow_id =>
|
109
|
-
young = Run.create(:workflow_id =>
|
127
|
+
older = Run.create(:workflow_id => @workflow.id)
|
128
|
+
young = Run.create(:workflow_id => @workflow.id)
|
110
129
|
older.parent = young
|
111
130
|
refute older.save, "Run saved with a younger parent"
|
112
131
|
end
|
113
132
|
|
114
133
|
test "parent/child graph should be acyclic" do
|
115
|
-
parent = Run.create(:workflow_id =>
|
116
|
-
child = Run.create(:workflow_id =>
|
134
|
+
parent = Run.create(:workflow_id => @workflow.id)
|
135
|
+
child = Run.create(:workflow_id => @workflow.id)
|
117
136
|
parent.children << child
|
118
137
|
parent.parent = child
|
119
138
|
refute parent.save, "Run saved with child as its parent"
|
120
139
|
end
|
121
140
|
|
122
141
|
test "finding root ancestor of a run" do
|
123
|
-
one = Run.create(:workflow_id =>
|
142
|
+
one = Run.create(:workflow_id => @workflow.id)
|
124
143
|
assert_same one, one.root_ancestor, "Single run is not its own root"
|
125
144
|
assert_equal 0, one.children.count, "Not a parent, should not have children"
|
126
145
|
|
127
|
-
two = Run.create(:workflow_id =>
|
146
|
+
two = Run.create(:workflow_id => @workflow.id)
|
128
147
|
assert_same two, two.root_ancestor, "Single run is not its own root"
|
129
148
|
|
130
149
|
two.parent = one
|
@@ -133,7 +152,7 @@ module TavernaPlayer
|
|
133
152
|
assert_same one, two.root_ancestor, "Child run does not have parent as its root"
|
134
153
|
assert_equal 1, one.children.count, "Parent should have one child"
|
135
154
|
|
136
|
-
three = Run.create(:workflow_id =>
|
155
|
+
three = Run.create(:workflow_id => @workflow.id)
|
137
156
|
assert_same three, three.root_ancestor, "Single run is not its own root"
|
138
157
|
|
139
158
|
three.parent = two
|
@@ -144,7 +163,7 @@ module TavernaPlayer
|
|
144
163
|
assert_equal 1, two.children.count, "Parent should have one child"
|
145
164
|
assert_equal 1, one.children.count, "Grandparent should have one child"
|
146
165
|
|
147
|
-
four = Run.create(:workflow_id =>
|
166
|
+
four = Run.create(:workflow_id => @workflow.id)
|
148
167
|
assert_same four, four.root_ancestor, "Single run is not its own root"
|
149
168
|
|
150
169
|
four.parent = one
|
@@ -155,7 +174,7 @@ module TavernaPlayer
|
|
155
174
|
|
156
175
|
test "create run from another run" do
|
157
176
|
assert_difference(["Run.count", "RunPort::Input.count"]) do
|
158
|
-
parent =
|
177
|
+
parent = @run3
|
159
178
|
run = Run.create(:parent_id => parent.id)
|
160
179
|
assert run.valid?, "Run is invalid"
|
161
180
|
refute run.new_record?, "Run was not saved"
|
@@ -167,7 +186,7 @@ module TavernaPlayer
|
|
167
186
|
|
168
187
|
test "new run from another run" do
|
169
188
|
assert_difference(["Run.count", "RunPort::Input.count"]) do
|
170
|
-
parent =
|
189
|
+
parent = @run3
|
171
190
|
run = Run.new(:parent_id => parent.id)
|
172
191
|
assert run.save, "Run was not saved"
|
173
192
|
assert run.has_parent?, "Run should have a parent"
|
@@ -177,7 +196,7 @@ module TavernaPlayer
|
|
177
196
|
end
|
178
197
|
|
179
198
|
test "killing parent should orphan child" do
|
180
|
-
parent =
|
199
|
+
parent = @run3
|
181
200
|
run = Run.create(:parent_id => parent.id)
|
182
201
|
assert run.valid?, "Child run is invalid"
|
183
202
|
assert_not_nil run.parent_id, "Child run has no parent"
|
@@ -192,5 +211,66 @@ module TavernaPlayer
|
|
192
211
|
run.reload
|
193
212
|
assert_nil run.parent_id, "Child run still has a parent"
|
194
213
|
end
|
214
|
+
|
215
|
+
test "delayed job state affects run state" do
|
216
|
+
assert @run8.initialized?, "Run should be initialized"
|
217
|
+
assert @run9.pending?, "Run should be pending"
|
218
|
+
|
219
|
+
assert @run10.running?, "Run should be running"
|
220
|
+
assert @run11.running?, "Run should be running"
|
221
|
+
|
222
|
+
refute @run8.job_failed?, "Job has not failed"
|
223
|
+
assert @run9.job_failed?, "Job has failed"
|
224
|
+
assert @run10.job_failed?, "Job has failed"
|
225
|
+
refute @run11.job_failed?, "Job has not failed"
|
226
|
+
end
|
227
|
+
|
228
|
+
test "can delete running run with failed delayed job" do
|
229
|
+
assert_difference(["Run.count", "Delayed::Job.count"], -1) do
|
230
|
+
@run9.destroy
|
231
|
+
end
|
232
|
+
end
|
233
|
+
|
234
|
+
test "cannot delete running run with running delayed job" do
|
235
|
+
assert_no_difference(["Run.count", "Delayed::Job.count"]) do
|
236
|
+
@run8.destroy
|
237
|
+
end
|
238
|
+
end
|
239
|
+
|
240
|
+
test "cancelling run where delayed job not locked" do
|
241
|
+
assert_no_difference("Run.count") do
|
242
|
+
assert_difference("Delayed::Job.count", -1) do
|
243
|
+
@run8.cancel
|
244
|
+
end
|
245
|
+
end
|
246
|
+
|
247
|
+
assert @run8.cancelled?, "Run should be cancelled"
|
248
|
+
end
|
249
|
+
|
250
|
+
test "cancelling run where delayed job has failed" do
|
251
|
+
assert_no_difference("Run.count") do
|
252
|
+
assert_difference("Delayed::Job.count", -1) do
|
253
|
+
@run9.cancel
|
254
|
+
end
|
255
|
+
end
|
256
|
+
|
257
|
+
assert @run9.cancelled?, "Run should be cancelled"
|
258
|
+
|
259
|
+
assert_no_difference("Run.count") do
|
260
|
+
assert_difference("Delayed::Job.count", -1) do
|
261
|
+
@run10.cancel
|
262
|
+
end
|
263
|
+
end
|
264
|
+
|
265
|
+
assert @run10.cancelled?, "Run should be cancelled"
|
266
|
+
end
|
267
|
+
|
268
|
+
test "do not destroy running delayed job upon cancel" do
|
269
|
+
assert_no_difference(["Run.count", "Delayed::Job.count"]) do
|
270
|
+
@run11.cancel
|
271
|
+
end
|
272
|
+
|
273
|
+
assert @run11.cancelling?, "Run should be cancelling"
|
274
|
+
end
|
195
275
|
end
|
196
276
|
end
|
@@ -32,6 +32,8 @@ class WorkerTest < ActiveSupport::TestCase
|
|
32
32
|
config.post_run_callback = @noop_callback
|
33
33
|
config.run_cancelled_callback = @noop_callback
|
34
34
|
config.run_failed_callback = @noop_callback
|
35
|
+
config.current_user_callback =
|
36
|
+
Proc.new { User.find(ActiveRecord::Fixtures.identify(:test_user)) }
|
35
37
|
end
|
36
38
|
|
37
39
|
# Stuff we can't test yet in TavernaPlayer::Worker.
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: taverna-player
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.9.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Robert Haines
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-09-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -52,6 +52,20 @@ dependencies:
|
|
52
52
|
- - ~>
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '4.1'
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: taverna-t2flow
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - ~>
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: 0.5.1
|
62
|
+
type: :runtime
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - ~>
|
67
|
+
- !ruby/object:Gem::Version
|
68
|
+
version: 0.5.1
|
55
69
|
- !ruby/object:Gem::Dependency
|
56
70
|
name: t2-server
|
57
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -237,6 +251,7 @@ files:
|
|
237
251
|
- .ruby-version
|
238
252
|
- .travis.yml
|
239
253
|
- CHANGES.rdoc
|
254
|
+
- CITATION
|
240
255
|
- Gemfile
|
241
256
|
- LICENCE.rdoc
|
242
257
|
- README.rdoc
|
@@ -250,12 +265,14 @@ files:
|
|
250
265
|
- app/controllers/taverna_player/job_queue_controller.rb
|
251
266
|
- app/controllers/taverna_player/runs_controller.rb
|
252
267
|
- app/controllers/taverna_player/service_credentials_controller.rb
|
268
|
+
- app/controllers/taverna_player/workflows_controller.rb
|
253
269
|
- app/helpers/taverna_player/application_helper.rb
|
254
270
|
- app/helpers/taverna_player/runs_helper.rb
|
255
271
|
- app/models/taverna_player/interaction.rb
|
256
272
|
- app/models/taverna_player/run.rb
|
257
273
|
- app/models/taverna_player/run_port.rb
|
258
274
|
- app/models/taverna_player/service_credential.rb
|
275
|
+
- app/models/taverna_player/workflow.rb
|
259
276
|
- app/views/layouts/taverna_player/embedded.html.erb
|
260
277
|
- app/views/taverna_player/job_queue/index.html.erb
|
261
278
|
- app/views/taverna_player/runs/_button.html.erb
|
@@ -286,6 +303,9 @@ files:
|
|
286
303
|
- app/views/taverna_player/service_credentials/index.html.erb
|
287
304
|
- app/views/taverna_player/service_credentials/new.html.erb
|
288
305
|
- app/views/taverna_player/service_credentials/show.html.erb
|
306
|
+
- app/views/taverna_player/workflows/_info.json.jbuilder
|
307
|
+
- app/views/taverna_player/workflows/index.html.erb
|
308
|
+
- app/views/taverna_player/workflows/index.json.jbuilder
|
289
309
|
- config/locales/en.yml
|
290
310
|
- config/routes.rb
|
291
311
|
- db/migrate/20130313105546_create_taverna_player_runs.rb
|
@@ -318,6 +338,7 @@ files:
|
|
318
338
|
- db/migrate/20131127163438_remove_run_id_index_from_taverna_player_runs.rb
|
319
339
|
- db/migrate/20131127171823_remove_unused_paperclip_columns.rb
|
320
340
|
- db/migrate/20140226135723_change_taverna_player_runs_status_message_to_use_keys.rb
|
341
|
+
- db/migrate/20140917165505_create_taverna_player_workflows.rb
|
321
342
|
- lib/generators/taverna_player/callbacks_generator.rb
|
322
343
|
- lib/generators/taverna_player/controllers_generator.rb
|
323
344
|
- lib/generators/taverna_player/install_generator.rb
|
@@ -331,8 +352,10 @@ files:
|
|
331
352
|
- lib/generators/templates/controllers/job_queue_controller.rb
|
332
353
|
- lib/generators/templates/controllers/runs_controller.rb
|
333
354
|
- lib/generators/templates/controllers/service_credentials_controller.rb
|
355
|
+
- lib/generators/templates/controllers/workflows_controller.rb
|
334
356
|
- lib/generators/templates/models/run.rb
|
335
357
|
- lib/generators/templates/models/run_port.rb
|
358
|
+
- lib/generators/templates/models/workflow.rb
|
336
359
|
- lib/generators/templates/player_initializer.rb
|
337
360
|
- lib/generators/templates/server_initializer.rb
|
338
361
|
- lib/tasks/delete-cancelled-runs.rake
|
@@ -342,10 +365,12 @@ files:
|
|
342
365
|
- lib/taverna_player/concerns/controllers/job_queue_controller.rb
|
343
366
|
- lib/taverna_player/concerns/controllers/runs_controller.rb
|
344
367
|
- lib/taverna_player/concerns/controllers/service_credentials_controller.rb
|
368
|
+
- lib/taverna_player/concerns/controllers/workflows_controller.rb
|
345
369
|
- lib/taverna_player/concerns/models/input_port.rb
|
346
370
|
- lib/taverna_player/concerns/models/output_port.rb
|
347
371
|
- lib/taverna_player/concerns/models/run.rb
|
348
372
|
- lib/taverna_player/concerns/models/run_port.rb
|
373
|
+
- lib/taverna_player/concerns/models/workflow.rb
|
349
374
|
- lib/taverna_player/concerns/utils.rb
|
350
375
|
- lib/taverna_player/concerns/zip.rb
|
351
376
|
- lib/taverna_player/engine.rb
|
@@ -365,12 +390,9 @@ files:
|
|
365
390
|
- test/dummy/app/controllers/home_controller.rb
|
366
391
|
- test/dummy/app/controllers/taverna_player/runs_controller.rb
|
367
392
|
- test/dummy/app/controllers/taverna_player/service_credentials_controller.rb
|
368
|
-
- test/dummy/app/controllers/workflows_controller.rb
|
369
393
|
- test/dummy/app/models/user.rb
|
370
|
-
- test/dummy/app/models/workflow.rb
|
371
394
|
- test/dummy/app/views/home/index.html.erb
|
372
395
|
- test/dummy/app/views/layouts/application.html.erb
|
373
|
-
- test/dummy/app/views/workflows/index.html.erb
|
374
396
|
- test/dummy/config.ru
|
375
397
|
- test/dummy/config/application.rb
|
376
398
|
- test/dummy/config/boot.rb
|
@@ -422,6 +444,8 @@ files:
|
|
422
444
|
- test/dummy/db/migrate/20131127163539_remove_run_id_index_from_taverna_player_runs.taverna_player.rb
|
423
445
|
- test/dummy/db/migrate/20131127172420_remove_unused_paperclip_columns.taverna_player.rb
|
424
446
|
- test/dummy/db/migrate/20140226143013_change_taverna_player_runs_status_message_to_use_keys.taverna_player.rb
|
447
|
+
- test/dummy/db/migrate/20140917165846_drop_workflows.rb
|
448
|
+
- test/dummy/db/migrate/20140917170017_create_taverna_player_workflows.taverna_player.rb
|
425
449
|
- test/dummy/db/schema.rb
|
426
450
|
- test/dummy/lib/callbacks.rb
|
427
451
|
- test/dummy/log/.gitkeep
|
@@ -432,24 +456,26 @@ files:
|
|
432
456
|
- test/dummy/script/delayed_job
|
433
457
|
- test/dummy/script/rails
|
434
458
|
- test/dummy/test/functional/home_controller_test.rb
|
435
|
-
- test/dummy/test/functional/workflows_controller_test.rb
|
436
459
|
- test/dummy/tmp/.gitkeep
|
460
|
+
- test/fixtures/delayed_jobs.yml
|
437
461
|
- test/fixtures/files/non-ascii.csv
|
438
462
|
- test/fixtures/files/plain-text.bad-extension
|
439
463
|
- test/fixtures/taverna_player/interactions.yml
|
440
464
|
- test/fixtures/taverna_player/run_ports.yml
|
441
465
|
- test/fixtures/taverna_player/runs.yml
|
442
466
|
- test/fixtures/taverna_player/service_credentials.yml
|
467
|
+
- test/fixtures/taverna_player/workflows.yml
|
443
468
|
- test/fixtures/users.yml
|
444
|
-
- test/fixtures/workflows.yml
|
445
469
|
- test/functional/taverna_player/job_queue_controller_test.rb
|
446
470
|
- test/functional/taverna_player/runs_controller_test.rb
|
447
471
|
- test/functional/taverna_player/service_credentials_controller_test.rb
|
472
|
+
- test/functional/taverna_player/workflows_controller_test.rb
|
448
473
|
- test/taverna_player_test.rb
|
449
474
|
- test/test_helper.rb
|
450
475
|
- test/unit/helpers/taverna_player/application_helper_test.rb
|
451
476
|
- test/unit/helpers/taverna_player/runs_helper_test.rb
|
452
477
|
- test/unit/taverna_player/interaction_test.rb
|
478
|
+
- test/unit/taverna_player/model_proxy_test.rb
|
453
479
|
- test/unit/taverna_player/run_port_test.rb
|
454
480
|
- test/unit/taverna_player/run_test.rb
|
455
481
|
- test/unit/taverna_player/service_credential_test.rb
|
@@ -490,12 +516,9 @@ test_files:
|
|
490
516
|
- test/dummy/app/controllers/home_controller.rb
|
491
517
|
- test/dummy/app/controllers/taverna_player/runs_controller.rb
|
492
518
|
- test/dummy/app/controllers/taverna_player/service_credentials_controller.rb
|
493
|
-
- test/dummy/app/controllers/workflows_controller.rb
|
494
519
|
- test/dummy/app/models/user.rb
|
495
|
-
- test/dummy/app/models/workflow.rb
|
496
520
|
- test/dummy/app/views/home/index.html.erb
|
497
521
|
- test/dummy/app/views/layouts/application.html.erb
|
498
|
-
- test/dummy/app/views/workflows/index.html.erb
|
499
522
|
- test/dummy/config.ru
|
500
523
|
- test/dummy/config/application.rb
|
501
524
|
- test/dummy/config/boot.rb
|
@@ -547,6 +570,8 @@ test_files:
|
|
547
570
|
- test/dummy/db/migrate/20131127163539_remove_run_id_index_from_taverna_player_runs.taverna_player.rb
|
548
571
|
- test/dummy/db/migrate/20131127172420_remove_unused_paperclip_columns.taverna_player.rb
|
549
572
|
- test/dummy/db/migrate/20140226143013_change_taverna_player_runs_status_message_to_use_keys.taverna_player.rb
|
573
|
+
- test/dummy/db/migrate/20140917165846_drop_workflows.rb
|
574
|
+
- test/dummy/db/migrate/20140917170017_create_taverna_player_workflows.taverna_player.rb
|
550
575
|
- test/dummy/db/schema.rb
|
551
576
|
- test/dummy/lib/callbacks.rb
|
552
577
|
- test/dummy/log/.gitkeep
|
@@ -557,24 +582,26 @@ test_files:
|
|
557
582
|
- test/dummy/script/delayed_job
|
558
583
|
- test/dummy/script/rails
|
559
584
|
- test/dummy/test/functional/home_controller_test.rb
|
560
|
-
- test/dummy/test/functional/workflows_controller_test.rb
|
561
585
|
- test/dummy/tmp/.gitkeep
|
586
|
+
- test/fixtures/delayed_jobs.yml
|
562
587
|
- test/fixtures/files/non-ascii.csv
|
563
588
|
- test/fixtures/files/plain-text.bad-extension
|
564
589
|
- test/fixtures/taverna_player/interactions.yml
|
565
590
|
- test/fixtures/taverna_player/run_ports.yml
|
566
591
|
- test/fixtures/taverna_player/runs.yml
|
567
592
|
- test/fixtures/taverna_player/service_credentials.yml
|
593
|
+
- test/fixtures/taverna_player/workflows.yml
|
568
594
|
- test/fixtures/users.yml
|
569
|
-
- test/fixtures/workflows.yml
|
570
595
|
- test/functional/taverna_player/job_queue_controller_test.rb
|
571
596
|
- test/functional/taverna_player/runs_controller_test.rb
|
572
597
|
- test/functional/taverna_player/service_credentials_controller_test.rb
|
598
|
+
- test/functional/taverna_player/workflows_controller_test.rb
|
573
599
|
- test/taverna_player_test.rb
|
574
600
|
- test/test_helper.rb
|
575
601
|
- test/unit/helpers/taverna_player/application_helper_test.rb
|
576
602
|
- test/unit/helpers/taverna_player/runs_helper_test.rb
|
577
603
|
- test/unit/taverna_player/interaction_test.rb
|
604
|
+
- test/unit/taverna_player/model_proxy_test.rb
|
578
605
|
- test/unit/taverna_player/run_port_test.rb
|
579
606
|
- test/unit/taverna_player/run_test.rb
|
580
607
|
- test/unit/taverna_player/service_credential_test.rb
|