projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12123-arv-ws-keyerror'
[arvados.git]
/
apps
/
workbench
/
test
/
test_helper.rb
diff --git
a/apps/workbench/test/test_helper.rb
b/apps/workbench/test/test_helper.rb
index 41592af993261b6affd55fa6cba0f05780d475ec..503db0818dbed0f5d15a47023a5cfba5430141d0 100644
(file)
--- a/
apps/workbench/test/test_helper.rb
+++ b/
apps/workbench/test/test_helper.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
ENV["RAILS_ENV"] = "test" if (ENV["RAILS_ENV"] != "diagnostics" and ENV["RAILS_ENV"] != "performance")
unless ENV["NO_COVERAGE_TEST"]
ENV["RAILS_ENV"] = "test" if (ENV["RAILS_ENV"] != "diagnostics" and ENV["RAILS_ENV"] != "performance")
unless ENV["NO_COVERAGE_TEST"]
@@
-31,15
+35,17
@@
class ActiveSupport::TestCase
# Note: You'll currently still have to declare fixtures explicitly
# in integration tests -- they do not yet inherit this setting
fixtures :all
# Note: You'll currently still have to declare fixtures explicitly
# in integration tests -- they do not yet inherit this setting
fixtures :all
- def use_token token_name
- was = Thread.current[:arvados_api_token]
+ def use_token(token_name)
+ user_was = Thread.current[:user]
+ token_was = Thread.current[:arvados_api_token]
auth = api_fixture('api_client_authorizations')[token_name.to_s]
Thread.current[:arvados_api_token] = auth['api_token']
if block_given?
begin
yield
ensure
auth = api_fixture('api_client_authorizations')[token_name.to_s]
Thread.current[:arvados_api_token] = auth['api_token']
if block_given?
begin
yield
ensure
- Thread.current[:arvados_api_token] = was
+ Thread.current[:user] = user_was
+ Thread.current[:arvados_api_token] = token_was
end
end
end
end
end
end
@@
-81,7
+87,7
@@
module ApiFixtureLoader
file = file[0, trim_index] if trim_index
YAML.load(file)
end
file = file[0, trim_index] if trim_index
YAML.load(file)
end
- keys.inject(@@api_fixtures[name]) { |hash, key| hash[key] }
+ keys.inject(@@api_fixtures[name]) { |hash, key| hash[key]
.deep_dup
}
end
end
def api_fixture(name, *keys)
end
end
def api_fixture(name, *keys)
@@
-233,12
+239,12
@@
end
class ActionController::TestCase
setup do
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 controller test"
end
end
assert_equal 1, 2, "Multiple actions in controller test"
end
end