1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-11-20 08:31:09 +00:00

feature: allow TestServer to open a websocket on any URL

* added `TestServer::ws_at(uri_str)`
* modified `TestServer::ws()` to call `self.ws_at("/")` to preserve
behavior

Closes #432
This commit is contained in:
jrconlin 2018-07-31 16:21:18 -07:00
parent 2071ea0532
commit dca4c110dd
No known key found for this signature in database
GPG key ID: 6E7B344D108DBD3D
3 changed files with 54 additions and 4 deletions

View file

@ -6,6 +6,8 @@
* Support HTTP/2 with rustls #36 * Support HTTP/2 with rustls #36
* Allow TestServer to open a websocket on any URL # 433
### Fixed ### Fixed
* Do not override HOST header for client request #428 * Do not override HOST header for client request #428

View file

@ -207,13 +207,21 @@ impl TestServer {
self.rt.block_on(fut) self.rt.block_on(fut)
} }
/// Connect to websocket server /// Connect to websocket server at a given path
pub fn ws_at(
&mut self,
path: &str,
) -> Result<(ws::ClientReader, ws::ClientWriter), ws::ClientError> {
let url = self.url(path);
self.rt
.block_on(ws::Client::with_connector(url, self.conn.clone()).connect())
}
/// Connect to a websocket server
pub fn ws( pub fn ws(
&mut self, &mut self,
) -> Result<(ws::ClientReader, ws::ClientWriter), ws::ClientError> { ) -> Result<(ws::ClientReader, ws::ClientWriter), ws::ClientError> {
let url = self.url("/"); self.ws_at("/")
self.rt
.block_on(ws::Client::with_connector(url, self.conn.clone()).connect())
} }
/// Create `GET` request /// Create `GET` request

View file

@ -64,6 +64,46 @@ fn test_simple() {
); );
} }
// websocket resource helper function
fn start_ws_resource(req: &HttpRequest) -> Result<HttpResponse, Error> {
ws::start(req, Ws)
}
#[test]
fn test_simple_path() {
const PATH:&str = "/v1/ws/";
// Create a websocket at a specific path.
let mut srv = test::TestServer::new(|app| {
app.resource(PATH, |r| r.route().f(start_ws_resource));
});
// fetch the sockets for the resource at a given path.
let (reader, mut writer) = srv.ws_at(PATH).unwrap();
writer.text("text");
let (item, reader) = srv.execute(reader.into_future()).unwrap();
assert_eq!(item, Some(ws::Message::Text("text".to_owned())));
writer.binary(b"text".as_ref());
let (item, reader) = srv.execute(reader.into_future()).unwrap();
assert_eq!(
item,
Some(ws::Message::Binary(Bytes::from_static(b"text").into()))
);
writer.ping("ping");
let (item, reader) = srv.execute(reader.into_future()).unwrap();
assert_eq!(item, Some(ws::Message::Pong("ping".to_owned())));
writer.close(Some(ws::CloseCode::Normal.into()));
let (item, _) = srv.execute(reader.into_future()).unwrap();
assert_eq!(
item,
Some(ws::Message::Close(Some(ws::CloseCode::Normal.into())))
);
}
#[test] #[test]
fn test_empty_close_code() { fn test_empty_close_code() {
let mut srv = test::TestServer::new(|app| app.handler(|req| ws::start(req, Ws))); let mut srv = test::TestServer::new(|app| app.handler(|req| ws::start(req, Ws)));