[ARVADOS] updated: 2d392cf1c0726dcde178199fdafc094ee62a954a

[Git user]

Summary of changes:
 apps/workbench/app/controllers/work_units_controller.rb      | 8 ++++----
 apps/workbench/test/controllers/workflows_controller_test.rb | 2 +-
 services/api/test/fixtures/workflows.yml                     | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

       via  2d392cf1c0726dcde178199fdafc094ee62a954a (commit)
      from  b758d48df3373a401cef74b0c8c99f918918afee (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 2d392cf1c0726dcde178199fdafc094ee62a954a
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 9 15:58:44 2016 -0400

    10005: update workflow fixture name and description as well and update workbench invocations of workflow.workflow.

diff --git a/apps/workbench/app/controllers/work_units_controller.rb b/apps/workbench/app/controllers/work_units_controller.rb
index 0c8ea6e..59b92e9 100644
--- a/apps/workbench/app/controllers/work_units_controller.rb
+++ b/apps/workbench/app/controllers/work_units_controller.rb
@@ -46,12 +46,12 @@ class WorkUnitsController < ApplicationController
     elsif rc == Workflow
       # workflow json
       workflow = Workflow.find? template_uuid
-      if workflow.workflow
+      if workflow.definition
         begin
-          wf_json = YAML::load(workflow.workflow)
+          wf_json = YAML::load(workflow.definition)
         rescue => e
-          logger.error "Error converting workflow yaml to json: #{e.message}"
-          raise ArgumentError, "Error converting workflow yaml to json: #{e.message}"
+          logger.error "Error converting definition yaml to json: #{e.message}"
+          raise ArgumentError, "Error converting definition yaml to json: #{e.message}"
         end
       end
 
diff --git a/apps/workbench/test/controllers/workflows_controller_test.rb b/apps/workbench/test/controllers/workflows_controller_test.rb
index 654f317..14db731 100644
--- a/apps/workbench/test/controllers/workflows_controller_test.rb
+++ b/apps/workbench/test/controllers/workflows_controller_test.rb
@@ -4,6 +4,6 @@ class WorkflowsControllerTest < ActionController::TestCase
   test "index" do
     get :index, {}, session_for(:active)
     assert_response :success
-    assert_includes @response.body, 'Valid workflow with no workflow yaml'
+    assert_includes @response.body, 'Valid workflow with no definition yaml'
   end
 end
diff --git a/services/api/test/fixtures/workflows.yml b/services/api/test/fixtures/workflows.yml
index 20e8ed8..4e1f4af 100644
--- a/services/api/test/fixtures/workflows.yml
+++ b/services/api/test/fixtures/workflows.yml
@@ -2,15 +2,15 @@ workflow_with_definition_yml:
   uuid: zzzzz-7fd4e-validworkfloyml
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   name: Valid workflow with name and desc
-  description: this workflow has a valid workflow yaml
+  description: this workflow has a valid definition yaml
   definition: "name: foo\ndesc: bar"
   created_at: 2016-08-15 12:00:00
 
 workflow_with_no_definition_yml:
   uuid: zzzzz-7fd4e-validbutnoyml00
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  name: Valid workflow with no workflow yaml
-  description: this workflow does not have a workflow yaml
+  name: Valid workflow with no definition yaml
+  description: this workflow does not have a definition yaml
   created_at: 2016-08-15 12:00:00
 
 workflow_with_no_name_and_desc:

-----------------------------------------------------------------------


hooks/post-receive
--