Skip to content

Commit

Permalink
Merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mattwr18 committed Jan 29, 2019
2 parents 1976b8e + 083df8b commit 18ede44
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
"scripts": {
"start": "webpack-dev-server --mode development --open",
"build": "webpack --mode production",
"test": "export NODE_ENV=testing && jest",
"fix":"standard --fix",
"test": "export NODE_ENV=testing && standard && jest",
"coveralls": "cat ./coverage/lcov.info | coveralls",
"cypress:ci": "cypress run",
"cypress:install": "cypress install",
"e2e:local": "cypress run --headed",
"e2e:ci": "npm-run-all --parallel --race start:ci 'cypress:ci --config baseUrl=http://localhost:8082'",
"start:ci": "webpack-dev-server --config ./webpack.config.js --port 8082 --mode production"

},
"cypress-cucumber-preprocessor": {
"nonGlobalStepDefinitions": true
Expand Down Expand Up @@ -75,6 +77,7 @@
],
"env": [
"jest"
]
],
"globals": ["cy"]
}
}
2 changes: 1 addition & 1 deletion src/components/Paginate.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Fragment } from 'react'
import React from 'react'
import { RingLoader } from 'react-spinners'

const Paginate = ({ items, Component, error }) => {
Expand Down
3 changes: 1 addition & 2 deletions src/tests/containers/ProjectsList.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { StaticRouter } from 'react-router'
import { ProjectsList } from '../../containers/ProjectsList'
import paginatedProjectsFixture from '../../fixtures/paginatedProjects'
import projectsFixture from '../../fixtures/projects'
import ErrorBoundary from '../../components/ErrorBoundary'

describe('ProjectsList', () => {
let e = { preventDefault: jest.fn() }
Expand Down Expand Up @@ -135,6 +134,6 @@ describe('ProjectsList', () => {
<ProjectsList projects={[]} error={[]} fetchProjects={() => {}} />
)
await wrapper.instance().componentDidMount()
await expect(wrapper.state().error).toEqual(true)
expect(wrapper.state().error).toEqual(true)
})
})

0 comments on commit 18ede44

Please sign in to comment.