Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-gale committed Mar 28, 2020
2 parents fbebd5f + 20372c1 commit 26e7a00
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 21 deletions.
10 changes: 5 additions & 5 deletions cypress/integration/factory/summary.spec.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
context('Factory', () => {
beforeEach(() => {
cy.visit('http://localhost:3000');
cy.wait(100);
cy.contains('Build Request').parent().find('button').click();
cy.wait(100); // eslint-disable-line cypress/no-unnecessary-waiting
cy.contains('Build Request').parent().find('button').click();
});

it('switch to the factory overview', () => {
cy.get('[aria-label="factory"]').click();
cy.get('[aria-label="factory"]').click();
});

it('view factory overview active build request details', () => {
cy.get('[aria-label="factory"]').click();
cy.contains('Active Build Requests').parent().find('button').click();
cy.get('[aria-label="factory"]').click();
cy.contains('Active Build Requests').parent().find('button').click();
});
});
19 changes: 19 additions & 0 deletions cypress/integration/factory/viewer.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
context('Factory', () => {
beforeEach(() => {
cy.visit('http://localhost:3000');
});

it('can click in center of factory view', () => {
cy.get('canvas').click('center');
});

it('can orbit camera of factory view', () => {
cy.get('canvas')
.trigger('mousedown', { button: 0 })
.trigger('mousemove', {
clientX: 550,
clientY: 250,
})
.trigger('mouseup', { force: true });
});
});
9 changes: 4 additions & 5 deletions cypress/integration/market/market.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ context('Market', () => {
});

it('get the first build request summary', () => {
cy.wait(100);
cy.contains('Build Request');
cy.wait(100); // eslint-disable-line cypress/no-unnecessary-waiting
cy.contains('Build Request');
});

it('bid on first build request summary', () => {
// Act
cy.wait(100);
cy.contains('Build Request').parent().find('button').click();
cy.wait(100); // eslint-disable-line cypress/no-unnecessary-waiting
cy.contains('Build Request').parent().find('button').click();
});

});
20 changes: 9 additions & 11 deletions cypress/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{
"compilerOptions": {
"strict": true,
"baseUrl": "../node_modules",
"target": "es5",
"lib": ["es5", "dom"],
"types": ["cypress"]
},
"include": [
"**/*.ts"
]
}
"compilerOptions": {
"strict": true,
"baseUrl": "../node_modules",
"target": "es5",
"lib": ["es5", "dom"],
"types": ["cypress"]
},
"include": ["**/*.ts"]
}

0 comments on commit 26e7a00

Please sign in to comment.