merge develop, fix conflicts, fix logged out bug

2018-12-29 16:25:45 +02:00 · 2018-12-29 16:25:45 +02:00 · 16c7bd0199
commit 16c7bd0199
parent 747e4090ca 1555a5fef3
19 changed files with 61 additions and 65 deletions
--- a/test/unit/specs/services/user_profile_link_generator/user_profile_link_generator.spec.js
+++ b/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 }
+    })
+  })
 })