Fix test and restore route alias

feugy · Dec 11, 2017 · 772fb38 · 772fb38
1 parent d22ffe8
commit 772fb38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/client/index.js b/client/index.js
@@ -13,7 +13,7 @@ if (process.env.NODE_ENV !== 'production') {
 
 // define routes
 app.route('/', views.competitions)
-// app.route('/competitions', views.competitions)
+app.route('/competitions', views.competitions)
 app.route('/competition/:id', views.competitionDetails)
 app.route('/*', views['404'])
 

diff --git a/client/test/utils/index.js b/client/test/utils/index.js
@@ -11,5 +11,5 @@ test('should timeout be asynchronous', async t => {
 test('should timeout run after N milliseconds', async t => {
   const start = performance.now()
   await timeout(10)
-  t.true(performance.now() - start >= 10)
+  t.true(performance.now() - start >= 9)
 })
diff --git a/server/lib/models/competition.js b/server/lib/models/competition.js
@@ -29,6 +29,9 @@ module.exports = class Competition {
    * @returns a plain JSON representation of this competition
    */
   toJSON () {
-    return Object.assign({}, this, {date: this.date.toDate()})
+    return {
+      ...this,
+      date: this.date.toDate()
+    }
   }
 }