14873: Fixes integration tests.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/services/api/.gitignore b/services/api/.gitignore
index 2cda8bcb1441967135b1feb5c2adf344e970da81..793e981b505abb63cef5730b5f299afaf42564a6 100644 (file)
--- 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 28da97f9eb5aa219ad963c5fc6e1b74a7de2c039..57463fe6a5963cf5a894f2582bbfaff6fb860774 100644 (file)
--- 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 e42715633fcbf4c01896cd07def22b966b70160b..b421f54596f9f5274eef4f943fb4ab09a2f96321 100644 (file)
--- 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 e15a13b8caf08f64bfd6fcb46d40f5d5821bc60a..d6fcc9ea09be03a321d89318c8b0bf9c442a4abe 100644 (file)
--- 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 479bda40c79f44ee8cd0a7164fc9b4a8362a40ac..6ac127087ea7c8f1793556ac3d043153c2f746c2 100644 (file)
--- 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 e57268f906889312a23be8cbb2221999738b5354..5886fb2d08965ee494898a4bf1ca06cfc70a18f2 100644 (file)
--- 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