[ARVADOS] updated: 87b2e5da50efa25671f1368e6cb162a5584fe030
git at public.curoverse.com
git at public.curoverse.com
Thu Oct 23 18:48:05 EDT 2014
Summary of changes:
.../app/controllers/actions_controller.rb | 2 +-
.../workbench/test/integration/collections_test.rb | 29 ++++++++++-
.../test/integration/pipeline_instances_test.rb | 25 ++++++----
doc/_includes/_skip_sso_server_install.liquid | 6 +++
doc/api/methods/nodes.html.textile.liquid | 2 +-
doc/images/workbench-dashboard.png | Bin 44822 -> 94257 bytes
doc/install/install-api-server.html.textile.liquid | 17 ++++++-
doc/install/install-keep.html.textile.liquid | 2 +
doc/install/install-sso.html.textile.liquid | 15 ++++++
.../install-workbench-app.html.textile.liquid | 9 +++-
...tutorial-pipeline-workbench.html.textile.liquid | 11 ++---
.../app/controllers/arvados/v1/nodes_controller.rb | 7 ---
services/api/app/models/node.rb | 54 ---------------------
services/api/config/application.default.yml | 6 ---
services/api/test/fixtures/collections.yml | 22 +++++++++
.../functional/arvados/v1/nodes_controller_test.rb | 2 +-
16 files changed, 119 insertions(+), 90 deletions(-)
create mode 100644 doc/_includes/_skip_sso_server_install.liquid
via 87b2e5da50efa25671f1368e6cb162a5584fe030 (commit)
via 7086db26dce2ed43098daf1198a37412a5e42e48 (commit)
via 587fcc936d7b5b0b8c16220a5932cf9441e02ab0 (commit)
via 6a40678734cd727a4c3be41f06bb4019fc1c6222 (commit)
via 358045151388f4c5d4078a96e1391b7f02e4ce88 (commit)
via 016ecd4c969e5bfa560702843c8e381eb3a33060 (commit)
via 091d56d4e04e5b1051787fdfcc27dd1d5a6f0ec7 (commit)
via 22db612b913e6b4d68b3600c04d06e4898a2f1a9 (commit)
via fcfd4428e2889ceb847b64b0819207c421de1abd (commit)
via ae4948ee3a6e2d55a44a31272d1f67b669b0345f (commit)
via 95b0d8142d04199eae27eea17e4a5353d6e3f141 (commit)
via 7149ee5d616b932a73fb7a311136e6db75020666 (commit)
via 1ed38089f9d9969abde1849743f0fdf52d3d2d93 (commit)
via 0311a59f177bd18fb46fc0ceefde5fc9ad07af63 (commit)
via 34471863720a9e301be1604c2bd546627d435606 (commit)
via 1a20f5f5423dfab4e03d267680da30125487425a (commit)
via 4265a54aa0d505c5c35b9b290e2c6600a2766709 (commit)
via 93ffb7c3e8c369a1ee7d5f8da08c92ee478f5ea4 (commit)
via 9feeea1226399a9fc28acc53eafc45d884f7db65 (commit)
via 351895cf665a1cc26ab0f39fed696909331c99c4 (commit)
via 91738b3c2331a102e4aefd4be580e0e979bc514f (commit)
via ea80735a2ea4067d682cde533565dc42920f8d5c (commit)
via a124a5350d31001a7c66381fa853dfcd78dddd06 (commit)
via 3ca013aedeae5b2085b8fb37ca80501117f0f918 (commit)
via 3bf2514da60ab2e0b7639959b650cc4d93784080 (commit)
via f2ba19f987bfe7de245176e9fb4ea5e783564494 (commit)
via 3ff1b002f559933d5856fb260a7381ba4fb44e6b (commit)
via a15315b96439f2971d4ac6f6868c9de05877cd7c (commit)
from 140012f16cc5945a8c469db3e11f13cc4493cc22 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 87b2e5da50efa25671f1368e6cb162a5584fe030
Merge: 7086db2 587fcc9
Author: Tim Pierce <twp at curoverse.com>
Date: Thu Oct 23 18:35:19 2014 -0400
Merge branch 'master' into 4015-collection-chooser-portable-data-hash
commit 7086db26dce2ed43098daf1198a37412a5e42e48
Author: Tim Pierce <twp at curoverse.com>
Date: Thu Oct 23 18:34:03 2014 -0400
4015: fix pipeline instance tests
diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 4e53db7..c537d35 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -131,36 +131,38 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
template = api_fixture('pipeline_templates')['simple_pipeline']
visit '/pipeline_templates'
- within('tr', text: 'Pipeline Template With Collection Input') do
+ within('tr', text: template['name']) do
find('a,button', text: 'Run').click
end
# project chooser
project = api_fixture('groups')['aproject']
within('.modal-dialog') do
- find('.selectable', text: 'A Project').click
+ find('.selectable', text: project['name']).click
find('button', text: 'Choose').click
end
# find the collection input field
input = page.all('a', text: 'Choose').select { |a|
- a[:href] =~ /Choose.a.dataset.for.foo.template.input/
+ a[:href] =~ /Choose.a.dataset.for.simple.pipeline.input/
}
assert_not_empty input
input.first.click
# Select a collection
- col = api_fixture('collections')['foo_collection_in_aproject']
+ col = api_fixture('collections')['collection_input_for_simple_pipeline']
within('.modal-dialog') do
- find('div', text: col['name']).click
+ find('div.selectable', text: col['name']).click
find('button', text: 'OK').click
end
# The collection's portable_data_hash, name, and uuid should have
# been recorded, respectively, as the value, selection_name and selection_uuid
# for this component's input script_parameter.
+ click_link 'Advanced'
+ click_link 'API response'
api_response = JSON.parse(find('div#advanced_api_response pre').text)
- input_params = api_response['components']['part-one']['script_parameters']['input']
+ input_params = api_response['components']['foo_component']['script_parameters']['input']
assert_equal input_params['value'], col['portable_data_hash']
assert_equal input_params['selection_name'], col['name']
assert_equal input_params['selection_uuid'], col['uuid']
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index c481424..b233418 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -123,6 +123,16 @@ empty:
manifest_text: ""
name: empty_collection
+collection_input_for_simple_pipeline:
+ uuid: zzzzz-4zz18-c5hn44njgog4hhm
+ portable_data_hash: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45
+ owner_uuid: zzzzz-j7d0g-v955i6s2oi1cbso
+ created_at: 2014-10-23 17:32:02 -0400
+ modified_at: 2014-10-23 17:32:02 -0400
+ updated_at: 2014-10-23 17:32:02 -0400
+ manifest_text: ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:foo\n"
+ name: collection input for simple pipeline
+
foo_collection_in_aproject:
uuid: zzzzz-4zz18-fy296fx3hot09f7
portable_data_hash: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list