projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 8465-stderr-redirection
[arvados.git]
/
services
/
api
/
test
/
integration
/
websocket_test.rb
diff --git
a/services/api/test/integration/websocket_test.rb
b/services/api/test/integration/websocket_test.rb
index 0822a67a52d327dd9f5a18a6fac1b3103ba0f454..549bbc6f9979d02c9f2f3bccd88cb7a078099c81 100644
(file)
--- a/
services/api/test/integration/websocket_test.rb
+++ b/
services/api/test/integration/websocket_test.rb
@@
-1,6
+1,6
@@
-require 'test_helper'
-require 'oj'
require 'database_cleaner'
require 'database_cleaner'
+require 'safe_json'
+require 'test_helper'
DatabaseCleaner.strategy = :deletion
DatabaseCleaner.strategy = :deletion
@@
-112,7
+112,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
ws_helper do |ws|
ws.on :message do |event|
ws_helper do |ws|
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
status = d["status"]
ws.close
end
status = d["status"]
ws.close
end
@@
-130,7
+130,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
status = d["status"]
ws.close
end
status = d["status"]
ws.close
end
@@
-152,7
+152,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
case state
when 1
assert_equal 200, d["status"]
@@
-189,7
+189,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
case state
when 1
assert_equal 200, d["status"]
@@
-229,7
+229,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
case state
when 1
assert_equal 200, d["status"]
@@
-268,7
+268,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
case state
when 1
assert_equal 200, d["status"]
@@
-312,7
+312,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
case state
when 1
assert_equal 200, d["status"]
@@
-337,8
+337,6
@@
class WebsocketTest < ActionDispatch::IntegrationTest
test "connect, subscribe, ask events starting at seq num" do
state = 1
test "connect, subscribe, ask events starting at seq num" do
state = 1
- human = nil
- human_ev_uuid = nil
authorize_with :active
authorize_with :active
@@
-352,7
+350,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
case state
when 1
assert_equal 200, d["status"]
@@
-381,7
+379,6
@@
class WebsocketTest < ActionDispatch::IntegrationTest
state = 1
spec = nil
spec_ev_uuid = nil
state = 1
spec = nil
spec_ev_uuid = nil
- filter_id = nil
authorize_with :active
authorize_with :active
@@
-397,7
+394,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
case state
when 1
assert_equal 200, d["status"]
@@
-445,7
+442,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
case state
when 1
assert_equal 200, d["status"]
@@
-490,7
+487,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
case state
when 1
assert_equal 200, d["status"]
@@
-560,7
+557,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
case state
when 1
assert_equal 200, d["status"]
@@
-584,7
+581,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
status = d["status"]
ws.close
end
status = d["status"]
ws.close
end
@@
-602,7
+599,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
status = d["status"]
ws.close
end
status = d["status"]
ws.close
end
@@
-620,7
+617,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
status = d["status"]
ws.close
end
status = d["status"]
ws.close
end
@@
-643,7
+640,7
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when (1..Rails.configuration.websocket_max_filters)
assert_equal 200, d["status"]
case state
when (1..Rails.configuration.websocket_max_filters)
assert_equal 200, d["status"]
@@
-678,13
+675,13
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
ActiveRecord::Base.transaction do
(1..202).each do
case state
when 1
assert_equal 200, d["status"]
ActiveRecord::Base.transaction do
(1..202).each do
-
spec =
Specimen.create
+ Specimen.create
end
end
state = 2
end
end
state = 2
@@
-705,8
+702,6
@@
class WebsocketTest < ActionDispatch::IntegrationTest
test "connect, subscribe with invalid filter" do
state = 1
test "connect, subscribe with invalid filter" do
state = 1
- human = nil
- human_ev_uuid = nil
authorize_with :active
authorize_with :active
@@
-717,12
+712,12
@@
class WebsocketTest < ActionDispatch::IntegrationTest
end
ws.on :message do |event|
end
ws.on :message do |event|
- d =
Oj.strict_
load event.data
+ d =
SafeJSON.
load event.data
case state
when 1
assert_equal 200, d["status"]
Specimen.create
case state
when 1
assert_equal 200, d["status"]
Specimen.create
-
human =
Human.create
+ Human.create
state = 2
when 2
assert_equal 500, d["status"]
state = 2
when 2
assert_equal 500, d["status"]