taverna-player 0.8.0 → 0.9.0

data/test/dummy/db/migrate/20140917165846_drop_workflows.rb

@@ -0,0 +1,9 @@
+class DropWorkflows < ActiveRecord::Migration
+  def up
+    drop_table :workflows
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/test/dummy/db/migrate/20140917170017_create_taverna_player_workflows.taverna_player.rb

@@ -0,0 +1,13 @@
+# This migration comes from taverna_player (originally 20140917165505)
+class CreateTavernaPlayerWorkflows < ActiveRecord::Migration
+  def change
+    create_table :taverna_player_workflows do |t|
+      t.string :title
+      t.string :author
+      t.text :description
+      t.string :file
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140226143013) do
+ActiveRecord::Schema.define(:version => 20140917170017) do
 
   create_table "delayed_jobs", :force => true do |t|
     t.integer  "priority",   :default => 0
@@ -103,14 +103,7 @@ ActiveRecord::Schema.define(:version => 20140226143013) do
 
   add_index "taverna_player_service_credentials", ["uri"], :name => "index_taverna_player_service_credentials_on_uri"
 
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.string   "email"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "workflows", :force => true do |t|
+  create_table "taverna_player_workflows", :force => true do |t|
     t.string   "title"
     t.string   "author"
     t.text     "description"
@@ -119,4 +112,11 @@ ActiveRecord::Schema.define(:version => 20140226143013) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.string   "email"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
 end

data/test/dummy/lib/callbacks.rb

@@ -11,21 +11,21 @@
 #------------------------------------------------------------------------------
 
 def player_pre_run_callback(run)
-  w = Workflow.find(run.workflow_id)
+  w = TavernaPlayer::Workflow.find(run.workflow_id)
   puts "Pre-run callback called for run '#{run.name}' of workflow '#{w.id}'"
 end
 
 def player_post_run_callback(run)
-  w = Workflow.find(run.workflow_id)
+  w = TavernaPlayer::Workflow.find(run.workflow_id)
   puts "Post-run callback called for run '#{run.name}' of workflow '#{w.id}'"
 end
 
 def player_run_cancelled_callback(run)
-  w = Workflow.find(run.workflow_id)
+  w = TavernaPlayer::Workflow.find(run.workflow_id)
   puts "Run-cancelled callback called for run '#{run.name}' of workflow '#{w.id}'"
 end
 
 def player_run_failed_callback(run)
-  w = Workflow.find(run.workflow_id)
+  w = TavernaPlayer::Workflow.find(run.workflow_id)
   puts "Run-failed callback called for run '#{run.name}' of workflow '#{w.id}'"
 end

data/test/fixtures/delayed_jobs.yml

@@ -0,0 +1,45 @@
+#------------------------------------------------------------------------------
+# Copyright (c) 2014 The University of Manchester, UK.
+#
+# BSD Licenced. See LICENCE.rdoc for details.
+#
+# Taverna Player was developed in the BioVeL project, funded by the European
+# Commission 7th Framework Programme (FP7), through grant agreement
+# number 283359.
+#
+# Author: Robert Haines
+#------------------------------------------------------------------------------
+
+# For some reason we can't use autogenerated IDs and we have to explicitly set
+# the created_at and updated_at fields otherwise we get database errors for
+# every test. Does DJ do something odd?
+
+one:
+  id: 1
+  run_at: 2014-07-21 18:20:00
+  created_at: 2014-07-21 18:20:00
+  updated_at: 2014-07-21 18:20:00
+
+two:
+  id: 2
+  run_at: 2014-07-21 18:20:00
+  failed_at: 2014-07-21 18:22:00
+  created_at: 2014-07-21 18:20:00
+  updated_at: 2014-07-21 18:22:00
+
+three:
+  id: 3
+  run_at: 2014-07-21 18:20:00
+  locked_at: 2014-07-21 18:21:00
+  locked_by: worker.0
+  failed_at: 2014-07-21 18:22:00
+  created_at: 2014-07-21 18:20:00
+  updated_at: 2014-07-21 18:22:00
+
+four:
+  id: 4
+  run_at: 2014-07-21 18:20:00
+  locked_at: 2014-07-21 18:21:00
+  locked_by: worker.0
+  created_at: 2014-07-21 18:20:00
+  updated_at: 2014-07-21 18:21:00

data/test/fixtures/taverna_player/interactions.yml

@@ -14,19 +14,19 @@ one:
   serial: ask0
   replied: false
   displayed: false
-  run_id: 4
+  run: four
   page_uri: ""
 
 two:
   serial: Nested_workflow:Interaction0
   replied: true
   displayed: true
-  run_id: 3
+  run: three
   page_uri: "http://www.example.com/interactions/1.html"
 
 three:
   serial: Nested_workflow:Interaction0
   replied: false
   displayed: true
-  run_id: 5
+  run: five
   page_uri: "http://www.example.com/interactions/2.html"

data/test/fixtures/taverna_player/run_ports.yml

@@ -11,59 +11,54 @@
 #------------------------------------------------------------------------------
 
 one:
-  id: 1
   name: Message
   value: Hello, World!
   port_type: TavernaPlayer::RunPort::Output
-  run_id: 1
+  run: one
   depth: 0
   metadata: "---\n:size: 13\n:type: text/plain"
 
 two:
-  id: 2
   name: OUT
   port_type: TavernaPlayer::RunPort::Output
-  run_id: 2
+  run: two
   depth: 1
   metadata: "---\n:size:\n- 7\n- 7\n- 974\n- 974\n- 7\n:type:\n- text/plain\n- text/plain\n- application/x-error\n- application/x-error\n- text/plain"
 
 three:
-  id: 3
   name: IN_Value
   value: Rob
   port_type: TavernaPlayer::RunPort::Input
-  run_id: 3
+  run: three
   depth: 0
   metadata: "---\n:size: 3\n:type: text/plain"
 
 four:
-  id: 4
   name: OUT
   value: Rob
   port_type: TavernaPlayer::RunPort::Output
-  run_id: 3
+  run: three
   depth: 0
   metadata: "---\n:size: 3\n:type: text/plain"
 
 five:
-  id: 5
   name: Long_N_unnecessary_Name_OUT
   value: (http://example.com/path?query=1)
   port_type: TavernaPlayer::RunPort::Output
-  run_id: 4
+  run: four
   depth: 0
   metadata: "---\n:size: 33\n:type: text/plain"
 
 six:
   name: Output
   port_type: TavernaPlayer::RunPort::Output
-  run_id: 2
+  run: two
   depth: 2
   metadata: "---\n:size:\n- - 15\n  - 20\n- - 17\n  - 22\n- - 19\n  - 24\n:type:\n- - text/plain\n  - text/plain\n- - text/plain\n  - text/plain\n- - text/plain\n  - text/plain\n"
 
 seven:
   name: OUT_Error
   port_type: TavernaPlayer::RunPort::Output
-  run_id: 2
+  run: two
   depth: 0
   metadata: "---\n:size: 718\n:type: application/x-error"

data/test/fixtures/taverna_player/runs.yml

@@ -11,64 +11,94 @@
 #------------------------------------------------------------------------------
 
 one:
-  id: 1
   run_id: 9dcfbaf1-4c55-40f0-9853-baa7f8410879
   name: Test run 1
   saved_state: pending
   create_time: 2013-03-13 10:55:46
   start_time: 2013-03-13 10:56:00
   finish_time: 2013-03-13 10:56:32
-  workflow_id: 1
+  workflow: one
 
 two:
-  id: 2
   run_id: 13246c77-ffa3-449f-9b18-0f085717f8eb
   name: Test run 2
   saved_state: running
   create_time: 2013-03-13 10:55:46
   start_time: 2013-03-13 10:55:55
   finish_time: 2013-03-13 10:57:07
-  workflow_id: 2
+  workflow: two
 
 three:
-  id: 3
   run_id: f8250afc-09c1-4129-ab28-e889a284594f
   name: Test run 3
   saved_state: finished
   create_time: 2013-03-13 10:55:46
   start_time: 2013-03-13 10:55:48
   finish_time: 2013-03-13 10:58:22
-  workflow_id: 3
+  workflow: three
   embedded: true
 
 four:
-  id: 4
   run_id: f8250afc-09c1-4129-ab28-e889a284594f
   name: Test run 4
   saved_state: running
   create_time: 2013-03-13 10:55:46
   start_time: 2013-03-13 10:55:48
-  workflow_id: 1
+  workflow: one
 
 five:
-  id: 5
   run_id: f8250afc-09c1-4129-ab28-e889a284594f
   name: Test run 5
   saved_state: running
   create_time: 2013-03-13 10:55:46
   start_time: 2013-03-13 10:55:48
-  workflow_id: 1
+  workflow: one
 
 six:
-  id: 6
   run_id: f8250afc-09c1-4129-ab28-e889a284594f
   name: Test run 6
   saved_state: failed
   create_time: 2013-03-13 10:55:46
   start_time: 2013-03-13 10:55:48
-  workflow_id: 1
+  workflow: one
 
 seven:
   name: Test run 7
   saved_state: pending
-  workflow_id: 1
+  workflow: one
+
+eight:
+  name: Test run 8
+  run_id: f8250afc-09c1-4129-ab28-e889a284594f
+  saved_state: initialized
+  create_time: 2013-03-13 10:55:46
+  start_time: 2013-03-13 10:55:48
+  workflow: one
+  delayed_job_id: 1
+
+nine:
+  name: Test run 9
+  run_id: f8250afc-09c1-4129-ab28-e889a284594f
+  saved_state: pending
+  create_time: 2013-03-13 10:55:46
+  start_time: 2013-03-13 10:55:48
+  workflow: one
+  delayed_job_id: 2
+
+ten:
+  name: Test run 10
+  run_id: f8250afc-09c1-4129-ab28-e889a284594f
+  saved_state: running
+  create_time: 2013-03-13 10:55:46
+  start_time: 2013-03-13 10:55:48
+  workflow: one
+  delayed_job_id: 3
+
+eleven:
+  name: Test run 11
+  run_id: f8250afc-09c1-4129-ab28-e889a284594f
+  saved_state: running
+  create_time: 2013-03-13 10:55:46
+  start_time: 2013-03-13 10:55:48
+  workflow: one
+  delayed_job_id: 4

data/test/fixtures/{workflows.yml → taverna_player/workflows.yml}

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2013 The University of Manchester, UK.
+# Copyright (c) 2013, 2014 The University of Manchester, UK.
 #
 # BSD Licenced. See LICENCE.rdoc for details.
 #
@@ -11,21 +11,18 @@
 #------------------------------------------------------------------------------
 
 one:
-  id: 1
   title: Hello, World!
   author: Robert Haines
   description: Say "Hello, World!"
   file: test/workflows/hello.t2flow
 
 two:
-  id: 2
   title: List of Fail
   author: Robert Haines
   description: Produce a list littered with errors
   file: test/workflows/list_with_errors.t2flow
 
 three:
-  id: 3
   title: Pass Through
   author: Robert Haines
   description: Pass the input straight through to the output

data/test/fixtures/users.yml

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# Copyright (c) 2013 The University of Manchester, UK.
+# Copyright (c) 2013, 2014 The University of Manchester, UK.
 #
 # BSD Licenced. See LICENCE.rdoc for details.
 #
@@ -10,7 +10,6 @@
 # Author: Robert Haines
 #------------------------------------------------------------------------------
 
-one:
-  id: 1
+test_user:
   name: Rob
   email: rob@example.com

data/test/functional/taverna_player/runs_controller_test.rb

@@ -20,8 +20,11 @@ module TavernaPlayer
       @run3 = taverna_player_runs(:three)
       @run4 = taverna_player_runs(:four)
       @run5 = taverna_player_runs(:five)
+      @run8 = taverna_player_runs(:eight)
+      @run9 = taverna_player_runs(:nine)
       @int = taverna_player_interactions(:one)
-      @workflow = workflows(:one)
+      @workflow1 = taverna_player_workflows(:one)
+      @workflow3 = taverna_player_workflows(:three)
       @routes = TavernaPlayer::Engine.routes
     end
 
@@ -40,25 +43,25 @@ module TavernaPlayer
     test "should route to a run output" do
       assert_routing @run2.outputs[0].path,
         { :controller => "taverna_player/runs", :action => "output",
-          :id => "2", :port => "OUT" }, {}, {}, "Did not route correctly"
+          :id => "#{@run2.id}", :port => "OUT" }, {}, {}, "Did not route correctly"
     end
 
     test "should route to a deep run output" do
       assert_routing @run2.outputs[0].path(0, 0),
         { :controller => "taverna_player/runs", :action => "output",
-          :id => "2", :port => "OUT", :path => "0/0" }, {}, {},
+          :id => "#{@run2.id}", :port => "OUT", :path => "0/0" }, {}, {},
         "Did not route correctly"
 
       assert_routing @run2.outputs[0].path([1, 2]),
         { :controller => "taverna_player/runs", :action => "output",
-          :id => "2", :port => "OUT", :path => "1/2" }, {}, {},
+          :id => "#{@run2.id}", :port => "OUT", :path => "1/2" }, {}, {},
         "Did not route correctly"
     end
 
     test "should route to a run input" do
       assert_routing @run3.inputs[0].path,
         { :controller => "taverna_player/runs", :action => "input",
-          :id => "3", :port => "IN_Value" }, {}, {}, "Did not route correctly"
+          :id => "#{@run3.id}", :port => "IN_Value" }, {}, {}, "Did not route correctly"
     end
 
     test "should route to cancel on a run" do
@@ -115,14 +118,14 @@ module TavernaPlayer
     end
 
     test "should get new and not be overridden" do
-      get :new, :workflow_id => 1, :use_route => :taverna_player
+      get :new, :workflow_id => @workflow1, :use_route => :taverna_player
       assert_response :success, "Response was not success"
       refute assigns(:override)
       assert_template "application", "Did not render with the correct layout"
     end
 
     test "should get new embedded" do
-      get :new, :workflow_id => 1, :embedded => "true",
+      get :new, :workflow_id => @workflow1, :embedded => "true",
         :use_route => :taverna_player
       assert_response :success, "Response was not success"
       assert_template "taverna_player/embedded",
@@ -163,7 +166,7 @@ module TavernaPlayer
 
     test "should fail to create run via browser" do
       assert_no_difference("Run.count") do
-        post :create, :run => { :workflow_id => @workflow.id, :name => nil }
+        post :create, :run => { :workflow_id => @workflow1.id, :name => nil }
       end
 
       assert_equal "Run was not successfully created.", flash[:alert],
@@ -172,7 +175,7 @@ module TavernaPlayer
 
     test "should create run via browser" do
       assert_difference("Run.count") do
-        post :create, :run => { :workflow_id => @workflow.id }
+        post :create, :run => { :workflow_id => @workflow1.id }
       end
 
       assert_redirected_to run_path(assigns(:run)),
@@ -186,7 +189,7 @@ module TavernaPlayer
     test "should create inputs along with run" do
       assert_difference("Run.count") do
         assert_difference("RunPort.count") do
-          post :create, :run => { :workflow_id => workflows(:three).id,
+          post :create, :run => { :workflow_id => @workflow3.id,
                                   :inputs_attributes => [{:value => 'test', :name => 'IN'}]
           }
         end
@@ -206,7 +209,7 @@ module TavernaPlayer
     test "should create embedded run via browser" do
       assert_difference("Run.count") do
         post :create,
-          :run => { :workflow_id => @workflow.id, :embedded => "true" }
+          :run => { :workflow_id => @workflow1.id, :embedded => "true" }
       end
 
       assert_redirected_to run_path(assigns(:run)),
@@ -220,7 +223,7 @@ module TavernaPlayer
 
     test "should create run via json" do
       assert_difference("Run.count") do
-        post :create, :run => { :workflow_id => @workflow.id },
+        post :create, :run => { :workflow_id => @workflow1.id },
           :format => :json
       end
 
@@ -234,7 +237,7 @@ module TavernaPlayer
     test "should create embedded run via json" do
       assert_difference("Run.count") do
         post :create,
-          :run => { :workflow_id => @workflow.id, :embedded => "true" },
+          :run => { :workflow_id => @workflow1.id, :embedded => "true" },
           :format => :json
       end
 
@@ -270,6 +273,30 @@ module TavernaPlayer
       assert_response :forbidden, "Response was not forbidden"
     end
 
+    test "should not destroy running run with running delayed job" do
+      @request.env["HTTP_REFERER"] = "/runs"
+      assert_no_difference(["Run.count", "Delayed::Job.count"],
+        "Run and Delayed::Job count changed") do
+          delete :destroy, :id => @run8, :use_route => :taverna_player
+      end
+
+      assert_equal "Run must be cancelled before deletion.", flash[:alert],
+        "Incorrect or missing flash notice"
+      assert_response :redirect, "Response was not a redirect"
+      assert_redirected_to runs_path, "Did not redirect correctly"
+    end
+
+    test "should destroy running run with failed delayed job" do
+      @request.env["HTTP_REFERER"] = "/runs"
+      assert_difference(["Run.count", "Delayed::Job.count"], -1,
+        "Run and Delayed::Job count did not reduce") do
+          delete :destroy, :id => @run9, :use_route => :taverna_player
+      end
+
+      assert_response :redirect, "Response was not a redirect"
+      assert_redirected_to runs_path, "Did not redirect correctly"
+    end
+
     test "should cancel run and redirect to index via browser" do
       @request.env["HTTP_REFERER"] = "/runs"
       put :cancel, :id => @run1, :use_route => :taverna_player
@@ -279,7 +306,7 @@ module TavernaPlayer
     end
 
     test "should cancel run and redirect to show via browser" do
-      @request.env["HTTP_REFERER"] = "/runs/1"
+      @request.env["HTTP_REFERER"] = "/runs/#{@run1.id}"
       put :cancel, :id => @run1, :use_route => :taverna_player
 
       assert_response :redirect, "Response was not a redirect"
@@ -304,7 +331,7 @@ module TavernaPlayer
     end
 
     test "should only return runs from workflow id 1" do
-      get :index, :workflow_id => @workflow
+      get :index, :workflow_id => @workflow1
       assert_response :success, "Response was not success"
       assert_not_nil assigns(:runs), "Did not assign a valid runs instance"
       assert_not_nil assigns(:override)