Skip to content

Commit

Permalink
V22.04.03 (#17)
Browse files Browse the repository at this point in the history
* Using the cypress action to run tests

* Bump version

* Fade
  • Loading branch information
FoxUSA authored Jul 19, 2022
1 parent 3f2201c commit 5497014
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 37 deletions.
5 changes: 1 addition & 4 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ You can download a [zip of the most recent release](https://github.com/FoxUSA/St
## Option 2: Using `docker`
`docker run -d -p 8080:80 foxusa/storedown`

<<<<<<< HEAD
## Option 3: Using `docker-compose`
=======
## Option 3: Using docker-compose
>>>>>>> master

> If you want to use SSL/TLS skip this and go down to that section
>
Put the following text in a `docker-compose.yml`.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storedown",
"version": "22.04.02",
"version": "22.04.03",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
Expand Down
12 changes: 1 addition & 11 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,7 @@
<title>StoreDown</title>
<style>
body {
background-color: rgb(48, 48, 48); /*Prevents a white blink*/
}
@keyframes colorchange {
from{
background-color:none;
opacity: 0;
}
to{
background-color: rgb(48, 48, 48);
opacity: 1;
}
background-color: rgb(48, 48, 48); /*Prevent a white blink 1/2*/
}
</style>
</head>
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default {

<style>
/* Fade everything */
* {
.application * { /* Just on application prevents blinkPrevent a white blink 2/2*/
animation: fadein .5s;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/specs/itemList.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('List View', () => {
})

it('handles a blank location save', () => {
//https://github.com/FoxUSA/StoreDown/issues/10 - There was an issue where if you saved an item with no location it would crash the list views
// https://github.com/FoxUSA/StoreDown/issues/10 - There was an issue where if you saved an item with no location it would crash the list views
cy.visit('/#/entry')// Go to the entry page
cy.get('[aria-label="Name"]').type('Blank Location')
cy.contains('Save').click()
Expand Down
36 changes: 18 additions & 18 deletions tests/e2e/specs/search.spec.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// describe('List View', () => {
// before(() => { //Don't need to reset anything
// cy.localMode()
// cy.loadTestData()
// })
describe('List View', () => {
before(() => { // Don't need to reset anything
cy.localMode()
cy.loadTestData()
})

// it('can find a uuid', () => {
// cy.visit('/#/')// Go to the entry page
// cy.get('input[placeholder="Search items"').type('8e71919a-4f03-4fa4-bdce-5767e38ed48e{enter}')
// cy.contains('USB A to USB C cable')
it('can find a uuid', () => {
cy.visit('/#/')// Go to the entry page
cy.get('input[placeholder="Search items"').type('8e71919a-4f03-4fa4-bdce-5767e38ed48e{enter}')
cy.contains('USB A to USB C cable')

// //Partial uuid
// cy.get('input[placeholder="Search items"').invoke('val', '').type('1a76be8{enter}')
// cy.contains('Dental floss pick')
// Partial uuid
cy.get('input[placeholder="Search items"').invoke('val', '').type('1a76be8{enter}')
cy.contains('Dental floss pick')

// //Click search with name
// cy.get('input[placeholder="Search items"').invoke('val', '').type('USB A to USB C cable')
// cy.get('.v-btn__content').contains('Search').click()
// cy.contains('8ed48e')
// })
// })
// Click search with name
cy.get('input[placeholder="Search items"').invoke('val', '').type('USB A to USB C cable')
cy.get('.v-btn__content').contains('Search').click()
cy.contains('8ed48e')
})
})
2 changes: 1 addition & 1 deletion tests/e2e/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Cypress.Commands.add('loadTestData', () => {
cy.visit('/#/import-export')

cy.get('textarea').invoke('val', testData).trigger('input')
cy.contains('Import YML').click().wait(500) //Let the ui process the data
cy.contains('Import YML').click().wait(500) // Let the ui process the data
})

//
Expand Down

0 comments on commit 5497014

Please sign in to comment.