Commit 01d6718f authored by Eduardo's avatar Eduardo

Apply suggestions from code review

Co-authored-by: 's avatarRobert Knight <robertknight@gmail.com>
parent 82d8ea93
......@@ -49,32 +49,30 @@ describe('PortProvider-PortFinder-PortRPC integration', () => {
});
it('enables the communication between guest-host', async () => {
let done;
const promise = new Promise(resolve => (done = resolve));
// guest frame
const simulateGuest = async () => {
const portFinder = new PortFinder({
hostFrame: window,
source: 'guest',
});
const hostRPC = new PortRPC();
const port = await portFinder.discover('host');
portFinder.discover('host').then(port => {
const hostRPC = new PortRPC();
hostRPC.connect(port);
await new Promise(resolve =>
hostRPC.call('ping', response => {
assert.equal(response, 'pong');
done();
});
});
resolve();
})
);
};
await delay(10); // add some realism
const simulateHost = async () => {
await delay(10); // simulate scenario when host frame is ready before the guest frame
// host frame
const portProvider = new PortProvider(window.location.origin);
portProvider.listen();
const guestRPC = new PortRPC();
// Register RPC method *before* connection
const guestRPC = new PortRPC();
guestRPC.on('ping', cb => cb('pong'));
portProvider.on('frameConnected', (source, port) => {
......@@ -82,43 +80,41 @@ describe('PortProvider-PortFinder-PortRPC integration', () => {
guestRPC.connect(port);
}
});
};
return promise;
return Promise.all([simulateGuest(), simulateHost()]);
});
it('enables the communication between guest-sidebar', async () => {
let done;
const promise = new Promise(resolve => (done = resolve));
// guest frame;
const portFinder1 = new PortFinder({
const simulateGuest = async () => {
const portFinder = new PortFinder({
hostFrame: window,
source: 'guest',
});
const sidebarRPC = new PortRPC();
const hostRPC = new PortRPC();
portFinder1.discover('sidebar').then(port => {
sidebarRPC.connect(port);
sidebarRPC.call('ping', response => {
assert.equal(response, 'pong');
done();
});
});
const port = await portFinder.discover('sidebar');
hostRPC.connect(port);
await delay(10); // add some realism
await new Promise(resolve =>
hostRPC.call('ping', response => {
assert.equal(response, 'pong');
resolve();
})
);
};
// sidebar frame
const portFinder2 = new PortFinder({
const simulateSidebar = async () => {
const portFinder = new PortFinder({
hostFrame: window,
source: 'sidebar',
});
const guestRPC = new PortRPC();
const port = await portFinder.discover('host');
// Register RPC method *before* connection
const guestRPC = new PortRPC();
guestRPC.on('ping', cb => cb('pong'));
const listenerCollection = new ListenerCollection();
portFinder2.discover('host').then(port => {
listenerCollection.add(port, 'message', ({ data, ports }) => {
if (
isMessageEqual(data, {
......@@ -130,41 +126,44 @@ describe('PortProvider-PortFinder-PortRPC integration', () => {
guestRPC.connect(ports[0]);
}
});
port.start(); // `start` method would be triggered by `hostRPC.connect(port)`
});
// host frame
port.start(); // `start` is normally invoked by `hostRPC.connect(port)`
};
const simulateHost = async () => {
await delay(10); // simulate scenario when host frame is ready before the guest frame
const portProvider = new PortProvider(window.location.origin);
portProvider.listen();
};
return promise;
return Promise.all([simulateGuest(), simulateSidebar(), simulateHost()]);
});
it('enables the communication between sidebar-host', async () => {
let done;
const promise = new Promise(resolve => (done = resolve));
// sidebar frame
const simulateSidebar = async () => {
const portFinder = new PortFinder({
hostFrame: window,
source: 'sidebar',
});
const hostRPC = new PortRPC();
const port = await portFinder.discover('host');
portFinder.discover('host').then(port => {
const hostRPC = new PortRPC();
hostRPC.connect(port);
await new Promise(resolve => {
hostRPC.call('ping', response => {
assert.equal(response, 'pong');
done();
resolve();
});
});
};
// host frame
const simulateHost = () => {
const portProvider = new PortProvider(window.location.origin);
portProvider.listen();
const sidebarRPC = new PortRPC();
// Register RPC method *before* connection
const sidebarRPC = new PortRPC();
sidebarRPC.on('ping', cb => cb('pong'));
portProvider.on('frameConnected', (source, port) => {
......@@ -172,7 +171,8 @@ describe('PortProvider-PortFinder-PortRPC integration', () => {
sidebarRPC.connect(port);
}
});
};
return promise;
return Promise.all([simulateSidebar(), simulateHost()]);
});
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment