test/stream/server/start_test.rb in diaspora-vines-0.2.0.develop.2 vs test/stream/server/start_test.rb in diaspora-vines-0.2.0.develop.3

@@ -16,51 +16,86 @@
     @stream = MiniTest::Mock.new
     @state = Vines::Stream::Server::Start.new(@stream)
   end
 
   def test_missing_namespace
-    node = node('<stream:stream/>')
-    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    EM.run {
+      node = node("<stream:stream/>")
+      assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+      EM.stop
+    }
   end
 
   def test_invalid_namespace
-    node = node(%Q{<stream:stream xmlns="#{Vines::NAMESPACES[:stream]}"/>})
-    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    EM.run {
+      node = node(%(<stream:stream xmlns="#{Vines::NAMESPACES[:stream]}"/>))
+      assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+      EM.stop
+    }
   end
 
   def test_valid_stream_tls_required
-    node = node(%Q{<stream:stream xmlns="jabber:client" xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>})
-    features = node(%Q{<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}"><starttls xmlns="#{Vines::NAMESPACES[:tls]}"/><dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>})
-    @stream.expect(:start, nil, [node])
-    @stream.expect(:vhost, VhostWrapper.new(false))
-    @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
-    @stream.expect(:dialback_retry?, false)
-    @stream.expect(:write, nil, [features])
-    @state.node(node)
-    assert @stream.verify
+    EM.run {
+      node = node(
+        %(<stream:stream xmlns="jabber:client" ) +
+        %(xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>)
+      )
+      features = node(
+        %(<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}">) +
+        %(<starttls xmlns="#{Vines::NAMESPACES[:tls]}"/>) +
+        %(<dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>)
+      )
+      @stream.expect(:start, nil, [node])
+      @stream.expect(:vhost, VhostWrapper.new(false))
+      @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
+      @stream.expect(:dialback_retry?, false)
+      @stream.expect(:write, nil, [features])
+      @state.node(node)
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   def test_valid_stream_with_dialback_flag
-    node = node(%Q{<stream:stream xmlns="jabber:client" xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>})
-    features = node(%Q{<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}"><dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>})
-    @stream.expect(:start, nil, [node])
-    @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
-    @stream.expect(:dialback_retry?, true)
-    @stream.expect(:write, nil, [features])
-    @state.node(node)
-    assert @stream.verify
+    EM.run {
+      node = node(
+        %(<stream:stream xmlns="jabber:client" ) +
+        %(xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>)
+      )
+      features = node(
+        %(<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}">) +
+        %(<dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>)
+      )
+      @stream.expect(:start, nil, [node])
+      @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
+      @stream.expect(:dialback_retry?, true)
+      @stream.expect(:write, nil, [features])
+      @state.node(node)
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   def test_valid_stream
-    node = node(%Q{<stream:stream xmlns="jabber:client" xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>})
-    features = node(%Q{<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}"><starttls xmlns="#{Vines::NAMESPACES[:tls]}"><required/></starttls><dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>})
-    @stream.expect(:start, nil, [node])
-    @stream.expect(:vhost, VhostWrapper.new(true))
-    @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
-    @stream.expect(:dialback_retry?, false)
-    @stream.expect(:write, nil, [features])
-    @state.node(node)
-    assert @stream.verify
+    EM.run {
+      node = node(
+        %(<stream:stream xmlns="jabber:client" ) +
+        %(xmlns:stream="#{Vines::NAMESPACES[:stream]}" to="host.com" version="1.0"/>)
+      )
+      features = node(
+        %(<stream:features xmlns:stream="#{Vines::NAMESPACES[:stream]}">) +
+        %(<starttls xmlns="#{Vines::NAMESPACES[:tls]}"><required/></starttls>) +
+        %(<dialback xmlns="#{Vines::NAMESPACES[:dialback]}"/></stream:features>)
+      )
+      @stream.expect(:start, nil, [node])
+      @stream.expect(:vhost, VhostWrapper.new(true))
+      @stream.expect(:advance, nil, [Vines::Stream::Server::AuthMethod])
+      @stream.expect(:dialback_retry?, false)
+      @stream.expect(:write, nil, [features])
+      @state.node(node)
+      assert @stream.verify
+      EM.stop
+    }
   end
 
   private
 
   def node(xml)