merge develop, fix conflicts, fix logged out bug

test/unit/specs/boot/routes.spec.js

@@ -12,7 +12,7 @@ describe('routes', () => {
   })
 
   it('root path', () => {
-    router.push('/~/main/all')
+    router.push('/main/all')
 
     const matchedComponents = router.getMatchedComponents()
 
@@ -26,4 +26,12 @@ describe('routes', () => {
 
     expect(matchedComponents[0].components.hasOwnProperty('UserCardContent')).to.eql(true)
   })
+
+  it('user\'s profile at /users', () => {
+    router.push('/users/fake-user-name')
+
+    const matchedComponents = router.getMatchedComponents()
+
+    expect(matchedComponents[0].components.hasOwnProperty('UserCardContent')).to.eql(true)
+  })
 })

test/unit/specs/services/user_profile_link_generator/user_profile_link_generator.spec.js

@@ -12,4 +12,10 @@ describe('generateProfileLink', () => {
       name: 'external-user-profile', params: { id: 1 }
     })
   })
+
+  it('returns obj for restricted user', () => {
+    expect(generateProfileLink(1, 'lain', ['lain'])).to.eql({
+      name: 'external-user-profile', params: { id: 1 }
+    })
+  })
 })