projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10078: Since we are not fetching components for pipeline instances (at least until...
[arvados.git]
/
services
/
api
/
test
/
test_helper.rb
diff --git
a/services/api/test/test_helper.rb
b/services/api/test/test_helper.rb
index 68d4bbf5af4b03349b11259f82357e917dd52cf7..417ddf6bee8eeee96d8e960099ccc227cee4950a 100644
(file)
--- a/
services/api/test/test_helper.rb
+++ b/
services/api/test/test_helper.rb
@@
-26,7
+26,7
@@
require 'mocha/mini_test'
module ArvadosTestSupport
def json_response
module ArvadosTestSupport
def json_response
- Oj.load response.body
+ Oj.
strict_
load response.body
end
def api_token(api_client_auth_name)
end
def api_token(api_client_auth_name)
@@
-36,6
+36,10
@@
module ArvadosTestSupport
def auth(api_client_auth_name)
{'HTTP_AUTHORIZATION' => "OAuth2 #{api_token(api_client_auth_name)}"}
end
def auth(api_client_auth_name)
{'HTTP_AUTHORIZATION' => "OAuth2 #{api_token(api_client_auth_name)}"}
end
+
+ def show_errors model
+ return lambda { model.errors.full_messages.inspect }
+ end
end
class ActiveSupport::TestCase
end
class ActiveSupport::TestCase
@@
-43,6
+47,11
@@
class ActiveSupport::TestCase
fixtures :all
include ArvadosTestSupport
fixtures :all
include ArvadosTestSupport
+ include CurrentApiClient
+
+ setup do
+ Rails.logger.warn "\n\n#{'=' * 70}\n#{self.class}\##{method_name}\n#{'-' * 70}\n\n"
+ end
teardown do
Thread.current[:api_client_ip_address] = nil
teardown do
Thread.current[:api_client_ip_address] = nil
@@
-102,16
+111,20
@@
class ActiveSupport::TestCase
ArvadosApiToken.new.call("rack.input" => "",
"HTTP_AUTHORIZATION" => "OAuth2 #{t}")
end
ArvadosApiToken.new.call("rack.input" => "",
"HTTP_AUTHORIZATION" => "OAuth2 #{t}")
end
+
+ def slow_test
+ skip "RAILS_TEST_SHORT is set" unless (ENV['RAILS_TEST_SHORT'] || '').empty?
+ end
end
class ActionController::TestCase
setup do
end
class ActionController::TestCase
setup do
- @counter = 0
+ @
test_
counter = 0
end
def check_counter action
end
def check_counter action
- @counter += 1
- if @counter == 2
+ @
test_
counter += 1
+ if @
test_
counter == 2
assert_equal 1, 2, "Multiple actions in functional test"
end
end
assert_equal 1, 2, "Multiple actions in functional test"
end
end