projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
closes #8703
[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 bf5afea1e2dd6b44fa68332df4c1f1512855a472..7579abf1ffd0234b3f1857516922416e1ff263e1 100644
(file)
--- a/
services/api/test/test_helper.rb
+++ b/
services/api/test/test_helper.rb
@@
-22,6
+22,7
@@
end
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
+require 'mocha/mini_test'
module ArvadosTestSupport
def json_response
module ArvadosTestSupport
def json_response
@@
-105,12
+106,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 functional test"
end
end
assert_equal 1, 2, "Multiple actions in functional test"
end
end