[ARVADOS] updated: 1.3.0-558-g18296ccf8
Git user
git at public.curoverse.com
Tue Mar 26 20:47:11 UTC 2019
Summary of changes:
services/api/.gitignore | 3 +++
services/api/app/controllers/application_controller.rb | 2 +-
services/api/app/controllers/static_controller.rb | 2 +-
services/api/config/application.rb | 14 +++++++++++++-
services/api/test/integration/crunch_dispatch_test.rb | 5 ++++-
services/api/test/integration/users_test.rb | 2 +-
6 files changed, 23 insertions(+), 5 deletions(-)
via 18296ccf884022679b9e1f7fa85e7f6d1dbfaad0 (commit)
from 82d7893e9b0816896885b3486b5e388002ec8bcb (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 18296ccf884022679b9e1f7fa85e7f6d1dbfaad0
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Tue Mar 26 17:46:42 2019 -0300
14873: Fixes integration tests.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --git a/services/api/.gitignore b/services/api/.gitignore
index 2cda8bcb1..793e981b5 100644
--- a/services/api/.gitignore
+++ b/services/api/.gitignore
@@ -33,3 +33,6 @@
# Generated when building distribution packages
/package-build.version
+
+# Debugger history
+.byebug_history
\ No newline at end of file
diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 28da97f9e..57463fe6a 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -326,7 +326,7 @@ class ApplicationController < ActionController::Base
if @attrs.is_a? String
@attrs = Oj.strict_load @attrs, symbol_keys: true
end
- unless @attrs.is_a? Hash
+ unless [Hash, ActionController::Parameters].include? @attrs.class
message = "No #{resource_name}"
if resource_name.index('_')
message << " (or #{resource_name.camelcase(:lower)})"
diff --git a/services/api/app/controllers/static_controller.rb b/services/api/app/controllers/static_controller.rb
index e42715633..b421f5459 100644
--- a/services/api/app/controllers/static_controller.rb
+++ b/services/api/app/controllers/static_controller.rb
@@ -25,7 +25,7 @@ class StaticController < ApplicationController
end
def empty
- render text: ""
+ render plain: ""
end
end
diff --git a/services/api/config/application.rb b/services/api/config/application.rb
index e15a13b8c..d6fcc9ea0 100644
--- a/services/api/config/application.rb
+++ b/services/api/config/application.rb
@@ -4,7 +4,19 @@
require File.expand_path('../boot', __FILE__)
-require 'rails/all'
+require "rails"
+# Pick only the frameworks we need:
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+# Skip ActionCable (new in Rails 5.0) as it adds '/cable' routes that we're not using
+# require "action_cable/engine"
+require "sprockets/railtie"
+require "rails/test_unit/railtie"
+
require 'digest'
module Kernel
diff --git a/services/api/test/integration/crunch_dispatch_test.rb b/services/api/test/integration/crunch_dispatch_test.rb
index 479bda40c..6ac127087 100644
--- a/services/api/test/integration/crunch_dispatch_test.rb
+++ b/services/api/test/integration/crunch_dispatch_test.rb
@@ -35,7 +35,10 @@ class CrunchDispatchIntegrationTest < ActionDispatch::IntegrationTest
script: "log",
repository: "active/crunchdispatchtest",
script_version: "f35f99b7d32bac257f5989df02b9f12ee1a9b0d6",
- script_parameters: "{}"
+ script_parameters: {
+ input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+ an_integer: '1'
+ }
}
},
headers: auth(:admin)
diff --git a/services/api/test/integration/users_test.rb b/services/api/test/integration/users_test.rb
index e57268f90..5886fb2d0 100644
--- a/services/api/test/integration/users_test.rb
+++ b/services/api/test/integration/users_test.rb
@@ -211,7 +211,7 @@ class UsersTest < ActionDispatch::IntegrationTest
verify_link_existence created['uuid'], created['email'], true, true, true, true, false
- post "/arvados/v1/users/#{created['uuid']}/unsetup", {}, auth(:admin)
+ post "/arvados/v1/users/#{created['uuid']}/unsetup", params: {}, headers: auth(:admin)
assert_response :success
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list