Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(v3 alpha, fix) Update client remote to use MainRouter #359

Merged
merged 1 commit into from
Oct 3, 2017
Merged

(v3 alpha, fix) Update client remote to use MainRouter #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SHELL := /bin/bash
.PHONY: test docs publish clean install exe dev

install:
python setup.py install && pip install -r requirements.txt
pip install -r requirements.txt && pip install -e .

test:
python -m pylama opentrons tests && python -m pytest \
Expand Down
2 changes: 1 addition & 1 deletion app/ui/robot/api-client/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default function client (dispatch) {
.on('notification', handleRobotNotification)
.on('error', handleClientError)

sessionManager = rpcClient.remote
sessionManager = rpcClient.remote.session_manager
session = sessionManager.session
robot = sessionManager.robot

Expand Down
4 changes: 3 additions & 1 deletion app/ui/robot/test/api-client.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ describe('api client', () => {
rpcClient = {
on: jest.fn(() => rpcClient),
close: jest.fn(),
remote: sessionManager
remote: {
session_manager: sessionManager
}
}

dispatch = jest.fn()
Expand Down