[ARVADOS] updated: dcb6eaa5012bf1eea607c61209bee18723769c24
Git user
git at public.curoverse.com
Mon Sep 5 13:48:25 EDT 2016
Summary of changes:
.../app/controllers/projects_controller.rb | 2 +-
.../app/controllers/workflows_controller.rb | 4 +
apps/workbench/app/models/container_work_unit.rb | 2 +-
.../application/_name_and_description.html.erb | 13 +-
.../_object_description.html.erb} | 2 +-
.../app/views/application/_object_name.html.erb | 5 +
.../_name_and_description.html.erb | 21 +++
.../projects/_show_pipeline_templates.html.erb | 5 +-
.../test/integration/anonymous_access_test.rb | 44 +++--
apps/workbench/test/integration/work_units_test.rb | 1 +
apps/workbench/test/integration_helper.rb | 18 ++-
build/README | 30 ++++
build/run-build-packages.sh | 23 +--
doc/sdk/java/index.html.textile.liquid | 8 +-
sdk/cwl/arvados_cwl/fsaccess.py | 4 +-
sdk/cwl/setup.py | 2 +-
sdk/cwl/tests/test_container.py | 7 +-
sdk/cwl/tests/test_job.py | 8 +-
sdk/java/ArvadosSDKJavaExample.java | 4 +-
sdk/java/ArvadosSDKJavaExampleWithPrompt.java | 2 +-
.../java/org/arvados/sdk/java/ArvadosTest.java | 5 +-
sdk/java/src/test/resources/first_pipeline.json | 1 -
.../api/app/controllers/application_controller.rb | 8 +-
.../controllers/arvados/v1/groups_controller.rb | 2 +-
.../app/controllers/arvados/v1/jobs_controller.rb | 166 +------------------
services/api/app/models/arvados_model.rb | 11 ++
services/api/app/models/job.rb | 177 ++++++++++++++++++++-
services/api/config/application.default.yml | 6 +
services/api/config/initializers/lograge.rb | 4 +-
...160901210110_repair_script_parameters_digest.rb | 17 ++
services/api/db/structure.sql | 4 +-
services/api/test/factories/api_client.rb | 2 +-
.../api/test/factories/api_client_authorization.rb | 2 +-
services/api/test/factories/user.rb | 10 +-
services/api/test/fixtures/workflows.yml | 2 +-
.../arvados/v1/job_reuse_controller_test.rb | 2 +-
services/api/test/test_helper.rb | 1 +
services/api/test/unit/job_test.rb | 6 +
services/fuse/tests/test_mount.py | 2 +-
39 files changed, 386 insertions(+), 247 deletions(-)
copy apps/workbench/app/views/{projects/_show_description.html.erb => application/_object_description.html.erb} (65%)
create mode 100644 apps/workbench/app/views/application/_object_name.html.erb
create mode 100644 apps/workbench/app/views/container_requests/_name_and_description.html.erb
create mode 100644 build/README
create mode 100644 services/api/db/migrate/20160901210110_repair_script_parameters_digest.rb
via dcb6eaa5012bf1eea607c61209bee18723769c24 (commit)
via d5ebfb1d35d2458742c545af4ee16c9f14de08bb (commit)
via ef439ae62e3b73ee81b428b64e62fe1fe13b32d0 (commit)
via b9e29babf66aa33ea2188f80d517b11e5755e83a (commit)
via 8f5ef3058658c046cd25e4fff7b2f0ffafb79b77 (commit)
via dfb8a488acce58b7dec6c3873964dc484f189b20 (commit)
via 97bb0917adfeb4db73c4c27cac8e337828c34015 (commit)
via 62481e29ad90ca0014574bb0f863b27cd93441a8 (commit)
via 9e1586545c360ccf8a0a24d2715b4c2250c8cda0 (commit)
via 2bf2f1905ac5d4c655e6f835b9143625e91a7fb6 (commit)
via 9bd3b2729a61f62ddbab10ac65fd9f7de837a10d (commit)
via 4cb02985f6d0b8aa436ed86506eb9b4d9d7d1c36 (commit)
via 29161e1c68253e4ba4cd59a4b648482e70e24ae9 (commit)
via 59448e46212f50fc317da51d93309d4e1642b55e (commit)
via 32db29a06f73c3261aa16283cf9aa19123a8814e (commit)
via 8a84fd1883edc4afe7aadde46954048668dbf416 (commit)
via f33a57a7cd93fcbf7d91ad65494ccf5cea512361 (commit)
via fe60a64c939c2089385e5697daa5868812555346 (commit)
via 98a4cd47053cc970e004169175b531afb22f8387 (commit)
via daeb6dc3dd1780acde5a2620ff44eb932995342b (commit)
via c1ac820b37938e3b9a533d93b55eb12a0808cf0d (commit)
via a87fd176c3248699cbaaa45b815c8a34b3f5f11b (commit)
via ac36412ff05d99c6bd6cdc236d5cb8b538cfe0ed (commit)
via 4fb2e411c6fec1dad6472d0080810a9b8d267c0f (commit)
from af0ece600054c97aae9661ed06731af47873a7ff (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 dcb6eaa5012bf1eea607c61209bee18723769c24
Merge: af0ece6 d5ebfb1
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Sep 5 13:47:54 2016 -0400
9799: Merge branch 'master' into 9799-nonadmin-logs
Conflicts:
apps/workbench/test/integration/application_layout_test.rb
diff --cc apps/workbench/test/integration/work_units_test.rb
index f842d12,63ba275..7d19fcc
--- a/apps/workbench/test/integration/work_units_test.rb
+++ b/apps/workbench/test/integration/work_units_test.rb
@@@ -55,76 -55,4 +55,77 @@@ class WorkUnitsTest < ActionDispatch::I
assert_no_selector "a[href=\"#{link}\"]"
end
end
+
+ [
+ ['jobs', 'running_job_with_components', true],
+ ['pipeline_instances', 'components_is_jobspec', false],
+ ['containers', 'running', false],
+ ['container_requests', 'running', true],
+ ].each do |type, fixture, cancelable|
+ test "cancel button for #{type}/#{fixture}" do
+ if cancelable
+ need_selenium 'to cancel'
+ end
+
+ obj = api_fixture(type)[fixture]
+ visit page_with_token "active", "/#{type}/#{obj['uuid']}"
+
+ assert_text 'created_at'
+ if cancelable
+ assert_selector 'button', text: 'Cancel'
+ click_button 'Cancel'
+ wait_for_ajax
+ end
+ assert_no_selector 'button', text: 'Cancel'
+ end
+ end
+
+ [
+ ['jobs', 'running_job_with_components'],
+ ['pipeline_instances', 'has_component_with_completed_jobs'],
+ ['container_requests', 'running'],
+ ['container_requests', 'completed'],
+ ].each do |type, fixture|
+ test "edit description for #{type}/#{fixture}" do
+ obj = api_fixture(type)[fixture]
+ visit page_with_token "active", "/#{type}/#{obj['uuid']}"
+
+ within('.arv-description-as-subtitle') do
+ find('.fa-pencil').click
+ find('.editable-input textarea').set('*Textile description for object*')
+ find('.editable-submit').click
+ end
+ wait_for_ajax
+
+ # verify description
+ assert page.has_no_text? '*Textile description for object*'
+ assert page.has_text? 'Textile description for object'
+ end
+ end
+
+ [
+ ['Two Part Pipeline Template', 'part-one', 'Provide a value for the following'],
+ ['Workflow with input specifications', 'this workflow has inputs specified', 'Provide a value for the following'],
+ ].each do |template_name, preview_txt, process_txt|
+ test "run a process using template #{template_name} from dashboard" do
+ visit page_with_token('admin')
+ assert_text 'Recent pipelines and processes' # seeing dashboard now
+
+ within('.recent-processes-actions') do
+ assert page.has_link?('All processes')
+ find('a', text: 'Run a pipeline').click
+ end
+
+ # in the chooser, verify preview and click Next button
+ within('.modal-dialog') do
+ find('.selectable', text: template_name).click
+ assert_text preview_txt
+ find('.btn', text: 'Next: choose inputs').click
+ end
+
+ # in the process page now
+ assert_text process_txt
++ assert_selector 'a', text: template_name
+ end
+ end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list