Merge branch 'upgrade-deps' into 'master'

chore: update dependencies

See merge request !48

app/routes.jsx

@@ -4,7 +4,7 @@ import { Route, Switch } from 'react-router-dom'
 // Manage
 import PostsManager from 'pubsweet-component-posts-manager/PostsManagerContainer'
 import UsersManager from 'pubsweet-component-users-manager/UsersManagerContainer'
-import TeamsManager from 'pubsweet-component-teams-manager/TeamsManagerContainer'
+import TeamsManager from 'pubsweet-component-teams-manager/src/TeamsManagerContainer'
 
 // Editor
 import MediumDraft from 'pubsweet-component-medium-draft/MediumDraftContainer'

config/default.js

@@ -4,10 +4,13 @@ const components = require('./components.json')
 
 module.exports = {
   'pubsweet-server': {
-    db: {},
+    db: {
+      database: 'starter',
+    },
     logger,
     port: 3000,
     uploads: 'uploads',
+    secret: 'helo',
   },
   'pubsweet-client': {
     API_ENDPOINT: '/api',

package.json

@@ -2,7 +2,12 @@
   "name": "@pubsweet/starter",
   "version": "1.0.0-alpha.1",
   "description": "A new pubsweet app",
-  "files": ["app", "config", "static", "webpack"],
+  "files": [
+    "app",
+    "config",
+    "static",
+    "webpack"
+  ],
   "main": "app.js",
   "dependencies": {
     "@pubsweet/db-manager": "^1.0.0",
@@ -26,7 +31,7 @@
     "pubsweet-component-signup": "^1.0.1",
     "pubsweet-component-teams-manager": "^1.0.1",
     "pubsweet-component-users-manager": "^1.0.1",
-    "pubsweet-server": "^2.0.0",
+    "pubsweet-server": "^7.2.0",
     "pubsweet-theme-plugin": "^0.0.3",
     "react-router-redux": "next"
   },
@@ -74,8 +79,8 @@
     "smtp-server": "^3.3.0",
     "string-replace-loader": "^1.2.0",
     "style-loader": "^0.21.0",
-    "testcafe": "^0.19.2",
-    "testcafe-react-selectors": "^1.0.5",
+    "testcafe": "^0.20.5",
+    "testcafe-react-selectors": "^2.0.0",
     "url-loader": "^0.6.2",
     "webpack": "^3.11.0",
     "webpack-hot-middleware": "^2.22.1"
@@ -88,8 +93,7 @@
     "setupdb": "pubsweet setupdb",
     "create:collection": "node scripts/add-collection.js",
     "precommit": "lint-staged",
-    "test":
-      "NODE_ENV=test NODE_PRESERVE_SYMLINKS=1 testcafe chrome 'test/**/*.test.js'"
+    "test": "NODE_ENV=test NODE_PRESERVE_SYMLINKS=1 testcafe chrome 'test/**/*.test.js'"
   },
   "repository": "https://gitlab.coko.foundation/pubsweet/pubsweet-starter",
   "license": "MIT"

test/admin.test.js

@@ -71,9 +71,6 @@ test('Manage teams journey', async t => {
   // delete it
   await t
     .click(manageTeams.teamDelete(0))
-    // TODO remove reload workaround once reducer bug fix is published
-    // https://gitlab.coko.foundation/pubsweet/pubsweet-client/merge_requests/127
-    .navigateTo(manageTeams.url)
     .expect(manageTeams.team(0).exists)
     .notOk()
 })

test/pageObjects/login.js

 import config from 'config'
 import { Selector, t } from 'testcafe'
-import ReactSelector from 'testcafe-react-selectors'
+import { ReactSelector } from 'testcafe-react-selectors'
 
 const login = {
   url: `${config.get('pubsweet-server.baseUrl')}/login`,

test/pageObjects/manage/posts.js

 import config from 'config'
-import ReactSelector from 'testcafe-react-selectors'
+import { ReactSelector } from 'testcafe-react-selectors'
 
 const managePosts = {
   url: `${config.get('pubsweet-server.baseUrl')}/manage/posts`,

test/pageObjects/manage/teams.js

 import config from 'config'
-import ReactSelector from 'testcafe-react-selectors'
+import { ReactSelector } from 'testcafe-react-selectors'
 
 const manageTeams = {
   url: `${config.get('pubsweet-server.baseUrl')}/manage/teams`,
@@ -12,12 +12,12 @@ const manageTeams = {
       .team(n)
       .find('td')
       .nth(1),
-  teamDelete: n => manageTeams.team(n).find('button'),
+  teamDelete: n => manageTeams.team(n).findReact('Button'),
 
-  teamName: ReactSelector('TeamCreator FormControl'),
-  teamType: ReactSelector('TeamCreator Select').nth(0),
-  collection: ReactSelector('TeamCreator Select').nth(1),
-  option: ReactSelector('TeamCreator Select Option'),
+  teamName: ReactSelector('TeamCreator TextField'),
+  teamType: ReactSelector('TeamCreator Menu').nth(0),
+  collection: ReactSelector('TeamCreator Menu').nth(1),
+  option: ReactSelector('TeamCreator Menu').findReact('DefaultMenuOption'),
   create: ReactSelector('TeamCreator Button'),
 }
 

test/pageObjects/manage/users.js

 import config from 'config'
-import ReactSelector from 'testcafe-react-selectors'
+import { ReactSelector } from 'testcafe-react-selectors'
 
 const manageUsers = {
   url: `${config.get('pubsweet-server.baseUrl')}/manage/users`,

test/pageObjects/passwordReset.js

 import config from 'config'
-import { Selector } from 'testcafe'
+import { ReactSelector } from 'testcafe-react-selectors'
 
 const passwordReset = {
   url: `${config.get('pubsweet-server.baseUrl')}/password-reset`,
 
-  title: Selector('h1'),
+  title: ReactSelector('PasswordReset h1'),
 
-  username: Selector('form input[type=text]'),
-  password: Selector('form input[type=password]'),
-  submit: Selector('form button'),
+  username: ReactSelector('PasswordReset').find('form input[type=text]'),
+  password: ReactSelector('PasswordReset').find('form input[type=password]'),
+  submit: ReactSelector('PasswordReset').find('form button'),
 
-  alert: Selector('.alert'),
+  alert: ReactSelector('PasswordReset'),
 }
 
 export default passwordReset

test/pageObjects/signup.js

 import config from 'config'
-import { Selector } from 'testcafe'
+import { ReactSelector } from 'testcafe-react-selectors'
 
 const signup = {
   url: `${config.get('pubsweet-server.baseUrl')}/signup`,
 
-  title: Selector('div[class^=Signup-local_title]'),
+  title: ReactSelector('Signup').find('h1'),
 
-  username: Selector('form input[type=text]'),
-  email: Selector('form input[type=email]'),
-  password: Selector('form input[type=password]'),
-  submit: Selector('form button'),
-  login: Selector('form a'),
+  username: ReactSelector('Signup').find('form input[type=text]'),
+  email: ReactSelector('Signup').find('form input[type=email]'),
+  password: ReactSelector('Signup').find('form input[type=password]'),
+  submit: ReactSelector('Signup').findReact('Button'),
+  login: ReactSelector('Singup').findReact('Link'),
 }
 
 export default signup