anyt 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 657c46d114ddd104cbfb7ea98fc4196b2a465e4645b8f458e77c6a5508afc0db
-  data.tar.gz: f53b2e08a5a5a091b7dd59ebc327310047c66204261c58a4306f889cb8577665
+  metadata.gz: 94cce22072abf225f715de0e1b343e2b94783eba7961778232bfb1508d4ebe6a
+  data.tar.gz: 00fd3d54c2f350c45440ba944e07388bd431668e3a28e34fa6c227b17081576c
 SHA512:
-  metadata.gz: 38b058d39af9ff05aca21f2cad0aecb4c00c795fbd45e65576847170d38c88cd2cdbf7629ec726e52ba6c80e7c688e15dc7543d3b96a39298b9373cc1067888b
-  data.tar.gz: 2df7835db36d97a4a333c525f0d81db7c2ba290d38752c4616105d4c58f5deedfaf08f45c22f37107382155beff2ba63f227a65fe7eee175b3add101bb26188c
+  metadata.gz: 9f64df7da832de830955aaf6906cf3a72b0984f4fc505db422e272e87aabdfc8ad39b05a9f48717fe2e523354ada94060e077a9ad4e457adb656a253579a3d49
+  data.tar.gz: 0b536582f0df8d7c2bf371fd4fd2cc1424ef289e7db40cc6a6afcbae68e577cf5422322ee0b013fae330f87f9a00778cb2a8be8f7794b246b4fcd0b4e8b87b34

data/lib/anyt/cli.rb

@@ -173,7 +173,7 @@ module Anyt
       def wait_till_terminated
         self_read = setup_signals
 
-        while readable_io = IO.select([self_read]) # rubocop:disable Lint/AssignmentInCondition
+        while readable_io = IO.select([self_read]) # rubocop:disable Lint/AssignmentInCondition, Lint/IncompatibleIoSelectWithFiberScheduler
           signal = readable_io.first[0].gets.strip
           raise Interrupt, "SIG#{signal} received"
         end

data/lib/anyt/client.rb

@@ -12,12 +12,10 @@ module Anyt
     WAIT_WHEN_EXPECTING_EVENT = 5
     WAIT_WHEN_NOT_EXPECTING_EVENT = 0.5
 
-    # rubocop: disable Metrics/AbcSize
-    # rubocop: disable Metrics/MethodLength
-    # rubocop: disable Metrics/BlockLength
     def initialize(
       ignore: [], url: Anyt.config.target_url, qs: "",
       cookies: "", headers: {},
+      protocol: "actioncable-v1-json",
       timeout_multiplier: Anyt.config.timeout_multiplier
     )
       ignore_message_types = @ignore_message_types = ignore
@@ -28,6 +26,7 @@ module Anyt
       @timeout_multiplier = timeout_multiplier
 
       headers = headers.merge("cookie" => cookies)
+      headers["Sec-WebSocket-Protocol"] = protocol
 
       open = Concurrent::Promise.new
 

data/lib/anyt/command.rb

@@ -6,8 +6,6 @@ module Anyt
   # Runs system command (websocket server)
   module Command
     class << self
-      # rubocop: disable Metrics/MethodLength
-      # rubocop: disable Metrics/AbcSize
       def run
         return if running?
 

data/lib/anyt/dummy/application.rb

@@ -13,7 +13,7 @@ class TestApp < Rails::Application
   secrets.secret_token = "secret_token"
   secrets.secret_key_base = "secret_key_base"
 
-  config.logger = Logger.new(STDOUT)
+  config.logger = Logger.new($stdout)
   config.log_level = AnyCable.config.log_level
   config.eager_load = true
 

data/lib/anyt/ext/minitest.rb

@@ -30,6 +30,20 @@ module Anyt
     def remote_client
       @remote_client ||= RemoteControl::Client.connect(Anyt.config.remote_control_port)
     end
+
+    # Verifies that the actual message Hash is a subset of the expected one
+    # (so we can ignore some irrelevant fields)
+    def assert_message(expected, actual)
+      assert_equal expected, actual.slice(*expected.keys)
+    end
+
+    def assert_includes_message(collection, expected)
+      found = collection.find do |el|
+        el.slice(*expected.keys) == expected
+      end
+
+      assert found, "Expecte #{collection} to include a message matching #{expected}"
+    end
   end
 end
 

data/lib/anyt/remote_control.rb

@@ -7,7 +7,7 @@ module Anyt
   module RemoteControl
     class Server
       class << self
-        alias start new
+        alias_method :start, :new
       end
 
       def initialize(port)

data/lib/anyt/rpc.rb

@@ -13,7 +13,6 @@ module Anyt # :nodoc:
       attr_accessor :running
       attr_reader :server
 
-      # rubocop: disable Metrics/AbcSize,Metrics/MethodLength
       def start
         AnyCable.logger.debug "Starting RPC server ..."
 
@@ -24,6 +23,10 @@ module Anyt # :nodoc:
           **AnyCable.config.to_grpc_params
         )
 
+        if defined?(::AnyCable::Middlewares::EnvSid)
+          AnyCable.middleware.use(::AnyCable::Middlewares::EnvSid)
+        end
+
         AnyCable.middleware.freeze
 
         server.start

data/lib/anyt/tests/core/ping_test.rb

@@ -13,7 +13,7 @@ feature "Ping" do
 
       current_stamp = ping["message"]
 
-      assert_equal ping["type"], "ping"
+      assert_equal "ping", ping["type"]
       assert_kind_of Integer, current_stamp
       refute_operator previous_stamp, :>=, current_stamp
 

data/lib/anyt/tests/core/welcome_test.rb

@@ -5,6 +5,6 @@ feature "Welcome" do
     Client receives "welcome" message
   ) do
     client = build_client(ignore: ["ping"])
-    assert_equal client.receive, "type" => "welcome"
+    assert_message({"type" => "welcome"}, client.receive)
   end
 end

data/lib/anyt/tests/features/channel_state_test.rb

@@ -37,7 +37,7 @@ feature "Channel state" do
       "identifier" => identifier, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 
   scenario %(
@@ -53,7 +53,7 @@ feature "Channel state" do
 
     msg = {"identifier" => identifier, "message" => {"count" => 3, "name" => "chipolino"}}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
   end
 
   scenario %(
@@ -67,7 +67,7 @@ feature "Channel state" do
       "identifier" => identifier2, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client2.receive
+    assert_message ack, client2.receive
 
     client2.close
 
@@ -76,6 +76,6 @@ feature "Channel state" do
       "message" => {"data" => "user left: chipollone"}
     }
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
   end
 end

data/lib/anyt/tests/features/remote_disconnect_test.rb

@@ -10,7 +10,7 @@ feature "Remote disconnect" do
    Close single connection by id
   ) do
     client = build_client(qs: "test=uid&uid=26", ignore: %w[ping])
-    assert_equal client.receive, "type" => "welcome"
+    assert_message({"type" => "welcome"}, client.receive)
 
     # Prevent race conditions when we send disconnect before internal channel subscription has been made
     # (only for Action Cable)
@@ -19,11 +19,13 @@ feature "Remote disconnect" do
 
     # Waiting for https://github.com/rails/rails/pull/39544
     unless Anyt.config.use_action_cable
-      assert_equal(
-        client.receive,
-        "type" => "disconnect",
-        "reconnect" => true,
-        "reason" => "remote"
+      assert_message(
+        {
+          "type" => "disconnect",
+          "reconnect" => true,
+          "reason" => "remote"
+        },
+        client.receive
       )
     end
 

data/lib/anyt/tests/features/server_restart_test.rb

@@ -14,15 +14,17 @@ feature "Server restart" do
       ignore: %(ping)
     )
 
-    assert_equal client.receive, "type" => "welcome"
+    assert_message({"type" => "welcome"}, client.receive)
 
     restart_server!
 
-    assert_equal(
-      client.receive,
-      "type" => "disconnect",
-      "reconnect" => true,
-      "reason" => "server_restart"
+    assert_message(
+      {
+        "type" => "disconnect",
+        "reconnect" => true,
+        "reason" => "server_restart"
+      },
+      client.receive
     )
   end
 end

data/lib/anyt/tests/request/channel_test.rb

@@ -13,7 +13,7 @@ feature "Request" do
     Channel has access to request
   ) do
     client = build_client(qs: "token=secret", ignore: %w[ping])
-    assert_equal client.receive, "type" => "welcome"
+    assert_message({"type" => "welcome"}, client.receive)
 
     subscribe_request = {command: "subscribe", identifier: {channel: channel}.to_json}
 
@@ -23,6 +23,6 @@ feature "Request" do
       "identifier" => {channel: channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 end

data/lib/anyt/tests/request/connection_test.rb

@@ -11,7 +11,7 @@ feature "Request" do
     Url is set during connection
   ) do
     client = build_client(qs: "test=request_url")
-    assert_equal client.receive, "type" => "welcome"
+    assert_message({"type" => "welcome"}, client.receive)
   end
 
   connect_handler("cookies") do
@@ -30,7 +30,7 @@ feature "Request" do
     Accepts when required cookies are set
   ) do
     client = build_client(qs: "test=cookies", cookies: "username=john green")
-    assert_equal client.receive, "type" => "welcome"
+    assert_message({"type" => "welcome"}, client.receive)
   end
 
   connect_handler("headers") do
@@ -49,6 +49,6 @@ feature "Request" do
     Accepts when required header is set
   ) do
     client = build_client(qs: "test=headers", headers: {"x-api-token" => "abc"})
-    assert_equal client.receive, "type" => "welcome"
+    assert_message({"type" => "welcome"}, client.receive)
   end
 end

data/lib/anyt/tests/request/disconnect_reasons_test.rb

@@ -10,11 +10,13 @@ feature "Request" do
     Receives disconnect message when rejected
   ) do
     client = build_client(qs: "test=reasons&reason=unauthorized")
-    assert_equal(
-      client.receive,
-      "type" => "disconnect",
-      "reconnect" => false,
-      "reason" => "unauthorized"
+    assert_message(
+      {
+        "type" => "disconnect",
+        "reconnect" => false,
+        "reason" => "unauthorized"
+      },
+      client.receive
     )
 
     client.wait_for_close

data/lib/anyt/tests/request/disconnection_test.rb

@@ -45,7 +45,7 @@ feature "Request" do
       "identifier" => {channel: a_channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
 
     subscribe_request = {command: "subscribe", identifier: {channel: b_channel}.to_json}
 
@@ -55,7 +55,7 @@ feature "Request" do
       "identifier" => {channel: b_channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
 
     subscribe_request = {command: "subscribe", identifier: {channel: a_channel}.to_json}
 
@@ -65,7 +65,7 @@ feature "Request" do
       "identifier" => {channel: a_channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client2.receive
+    assert_message ack, client2.receive
 
     subscribe_request = {command: "subscribe", identifier: {channel: b_channel}.to_json}
 
@@ -75,7 +75,7 @@ feature "Request" do
       "identifier" => {channel: b_channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client2.receive
+    assert_message ack, client2.receive
 
     client2.close
 
@@ -90,8 +90,8 @@ feature "Request" do
 
     msgs = [client.receive, client.receive]
 
-    assert_includes msgs, msg
-    assert_includes msgs, msg2
+    assert_includes_message msgs, msg
+    assert_includes_message msgs, msg2
   end
 
   scenario %(
@@ -106,7 +106,7 @@ feature "Request" do
       "identifier" => {channel: c_channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
 
     subscribe_request = {command: "subscribe", identifier: {channel: c_channel, id: 1}.to_json}
 
@@ -116,7 +116,7 @@ feature "Request" do
       "identifier" => {channel: c_channel, id: 1}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client2.receive
+    assert_message ack, client2.receive
 
     subscribe_request = {command: "subscribe", identifier: {channel: c_channel, id: 2}.to_json}
 
@@ -126,7 +126,7 @@ feature "Request" do
       "identifier" => {channel: c_channel, id: 2}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client2.receive
+    assert_message ack, client2.receive
 
     client2.close
 
@@ -142,7 +142,7 @@ feature "Request" do
 
     msgs = [client.receive, client.receive]
 
-    assert_includes msgs, msg
-    assert_includes msgs, msg2
+    assert_includes_message msgs, msg
+    assert_includes_message msgs, msg2
   end
 end

data/lib/anyt/tests/streams/broadcast_test.rb

@@ -16,7 +16,7 @@ feature "Broadcast data to stream" do
       "identifier" => {channel: channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 
   scenario %(
@@ -34,7 +34,7 @@ feature "Broadcast data to stream" do
       }
     }
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
   end
 
   scenario %(
@@ -47,7 +47,7 @@ feature "Broadcast data to stream" do
       "message" => "<script>alert('Message!');</script>"
     }
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
   end
 
   scenario %(
@@ -60,6 +60,6 @@ feature "Broadcast data to stream" do
       "message" => '{"script":{"alert":"Message!"}}'
     }
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
   end
 end

data/lib/anyt/tests/streams/multiple_clients_test.rb

@@ -19,8 +19,8 @@ feature "Streams with many clients" do
       "identifier" => {channel: channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
-    assert_equal ack, client2.receive
+    assert_message ack, client.receive
+    assert_message ack, client2.receive
   end
 
   scenario %(
@@ -30,8 +30,8 @@ feature "Streams with many clients" do
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
-    assert_equal msg, client.receive
-    assert_equal msg, client2.receive
+    assert_message msg, client.receive
+    assert_message msg, client2.receive
   end
 
   scenario %(
@@ -41,8 +41,8 @@ feature "Streams with many clients" do
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
-    assert_equal msg, client.receive
-    assert_equal msg, client2.receive
+    assert_message msg, client.receive
+    assert_message msg, client2.receive
 
     unsubscribe_request = {command: "unsubscribe", identifier: {channel: channel}.to_json}
 
@@ -55,7 +55,7 @@ feature "Streams with many clients" do
 
     msg2 = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "Y"}}
 
-    assert_equal msg2, client2.receive
+    assert_message msg2, client2.receive
     assert_raises(Anyt::Client::TimeoutError) { client.receive(timeout: 0.5) }
   end
 end

data/lib/anyt/tests/streams/multiple_test.rb

@@ -17,7 +17,7 @@ feature "Multiple streams" do
       "identifier" => {channel: channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 
   scenario %(
@@ -27,13 +27,13 @@ feature "Multiple streams" do
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
 
     ActionCable.server.broadcast("b", {data: "Y"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "Y"}}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
   end
 
   scenario %(
@@ -43,7 +43,7 @@ feature "Multiple streams" do
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
 
     unsubscribe_request = {command: "unsubscribe", identifier: {channel: channel}.to_json}
 

data/lib/anyt/tests/streams/single_test.rb

@@ -16,7 +16,7 @@ feature "Single stream" do
       "identifier" => {channel: channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 
   scenario %(
@@ -26,13 +26,13 @@ feature "Single stream" do
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
 
     ActionCable.server.broadcast("a", {data: "Y"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "Y"}}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
   end
 
   scenario %(
@@ -42,7 +42,7 @@ feature "Single stream" do
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
 
     unsubscribe_request = {command: "unsubscribe", identifier: {channel: channel}.to_json}
 
@@ -68,7 +68,7 @@ feature "Single stream" do
       "identifier" => {channel: channel, some_param: "test"}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
 
     ActionCable.server.broadcast("a", {data: "XX"})
 
@@ -77,7 +77,7 @@ feature "Single stream" do
 
     received = client.receive, client.receive
 
-    assert_includes received, msg
-    assert_includes received, msg2
+    assert_includes_message received, msg
+    assert_includes_message received, msg2
   end
 end

data/lib/anyt/tests/streams/stop_test.rb

@@ -25,7 +25,7 @@ feature "Stop streams" do
       "identifier" => {channel: channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 
   scenario %(
@@ -37,7 +37,7 @@ feature "Stop streams" do
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "X"}}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
 
     perform_request = {
       :command => "message",
@@ -52,6 +52,6 @@ feature "Stop streams" do
     ActionCable.server.broadcast("b", {data: "Z"})
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"data" => "Z"}}
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
   end
 end

data/lib/anyt/tests/subscriptions/ack_test.rb

@@ -20,7 +20,7 @@ feature "Subscription aknowledgement" do
       "identifier" => {channel: channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 
   scenario %(
@@ -34,6 +34,6 @@ feature "Subscription aknowledgement" do
       "identifier" => {channel: rejector_channel}.to_json, "type" => "reject_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 end

data/lib/anyt/tests/subscriptions/params_test.rb

@@ -14,7 +14,7 @@ feature "Subscription with params" do
       "identifier" => {channel: channel, id: 1}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
 
     subscribe_request_2 = {command: "subscribe", identifier: {channel: channel, id: 2}.to_json}
 
@@ -24,6 +24,6 @@ feature "Subscription with params" do
       "identifier" => {channel: channel, id: 2}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 end

data/lib/anyt/tests/subscriptions/perform_test.rb

@@ -23,7 +23,7 @@ feature "Subscription perform methods" do
       "identifier" => {channel: channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 
   scenario %(
@@ -39,7 +39,7 @@ feature "Subscription perform methods" do
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => "tock"}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
   end
 
   scenario %(
@@ -55,6 +55,6 @@ feature "Subscription perform methods" do
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => {"response" => "hello"}}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
   end
 end

data/lib/anyt/tests/subscriptions/transmissions_test.rb

@@ -17,16 +17,16 @@ feature "Subscription transmissions" do
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => "hello"}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
 
     msg = {"identifier" => {channel: channel}.to_json, "message" => "world"}
 
-    assert_equal msg, client.receive
+    assert_message msg, client.receive
 
     ack = {
       "identifier" => {channel: channel}.to_json, "type" => "confirm_subscription"
     }
 
-    assert_equal ack, client.receive
+    assert_message ack, client.receive
   end
 end

data/lib/anyt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anyt
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyt
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - palkan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -271,14 +271,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Anycable conformance testing tool