Skip to content

Commit

Permalink
fix: Updated tests after changes in the layout
Browse files Browse the repository at this point in the history
Some tests failed due to texts had been changed, and some files
removed.
  • Loading branch information
BKristenssonAlfsson committed Jun 4, 2020
1 parent 5f4a512 commit f55d59b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 19 deletions.
6 changes: 3 additions & 3 deletions cypress/integration/ambianic-tests/settings.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ context('Settings', () => {
})

it('Should have a title card', () => {
cy.get('[data-cy=titlecard]').contains('Connection details')
cy.get('[data-cy=titlecard]').contains('Ambianic Edge connection details')
})

it('Should have a local ambianic edge title card', () => {
cy.get('[data-cy=localtitlecard]').contains('Connect to local Ambianic Edge')
cy.get('[data-cy=localtitlecard]').contains('Pair with local Ambianic Edge device')
})

it('Should have a remote ambianic edge title card', () => {
cy.get('[data-cy=remotetitlecard]').contains('Connect to remote Ambianic Edge')
cy.get('[data-cy=remotetitlecard]').contains('Pair with remote Ambianic Edge device')
})

it('Should have remote connection button disabled', () => {
Expand Down
13 changes: 0 additions & 13 deletions cypress/integration/ambianic-tests/timeline.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,6 @@ context('Timeline', () => {
cy.get('[data-cy=connectioncard]').contains('Connecting to Ambianic Edge device...')
})

/**
* This will be removed once we have decided on the flow
* for future layout/flow in UI / Edge connection
*/
it('Should browse to edgeconnect', () => {

cy.wait(500)

cy.get('[data-cy=settings]').click()

cy.url().should('include', '/edge-connect')
})

// Try to get this to work once we have mock data

// it('Get timeline data', () => {
Expand Down
18 changes: 15 additions & 3 deletions src/views/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
align="start"
justify="center"
class="pb-5"
data-cy="template-row"
>
<v-card>
<v-card-title class="light grey">
<v-card-title
class="light grey"
data-cy="titlecard"
>
Ambianic Edge connection details
</v-card-title>
<v-container grid-list-sm>
Expand Down Expand Up @@ -163,7 +167,10 @@
class="pb-5"
>
<v-card>
<v-card-title class="light grey">
<v-card-title
class="light grey"
data-cy="localtitlecard"
>
Pair with local Ambianic Edge device
</v-card-title>
<v-container grid-list-sm>
Expand Down Expand Up @@ -204,7 +211,10 @@
class="pb-5"
>
<v-card>
<v-card-title class="light grey">
<v-card-title
class="light grey"
data-cy="remotetitlecard"
>
Pair with remote Ambianic Edge device
</v-card-title>
<v-container grid-list-sm>
Expand All @@ -230,6 +240,7 @@
outlined
dense
class="mt-4"
data-cy="remotePeerID"
/>
</v-card-text>

Expand All @@ -239,6 +250,7 @@
@click="sendEdgeAddress"
color="primary"
id="btn-sendRemotePeerID"
data-cy="sendRemotePeerID"
>
Pair Remotely
</v-btn>
Expand Down

0 comments on commit f55d59b

Please sign in to comment.