diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-08-06 22:02:21 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-08-06 22:02:21 -0600 |
| commit | dc9951d400fc6f4e9080d29589bf186fb081f4f6 (patch) | |
| tree | 06491c209236128adaf47644babd2ade44c490e3 /test/unit/specs/components/user_profile.spec.js | |
| parent | 18d69f93d38dc15a74db81ee4c10b4766bebfc35 (diff) | |
| parent | 610720f164dc9fcf36f9df33bddec5ac9c654e1e (diff) | |
Fix merge conflicts
Diffstat (limited to 'test/unit/specs/components/user_profile.spec.js')
| -rw-r--r-- | test/unit/specs/components/user_profile.spec.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/unit/specs/components/user_profile.spec.js b/test/unit/specs/components/user_profile.spec.js index 584758f7..0fbab722 100644 --- a/test/unit/specs/components/user_profile.spec.js +++ b/test/unit/specs/components/user_profile.spec.js @@ -163,7 +163,7 @@ const localProfileStore = createStore({ currentUser: { credentials: '' }, - usersObject: { 100: localUser, 'testuser': localUser }, + usersObject: { 100: localUser, testuser: localUser }, users: [localUser], relationships: {} } @@ -175,7 +175,7 @@ describe.skip('UserProfile', () => { it('renders external profile', () => { const wrapper = mount(UserProfile, { global: { - plugins: [ externalProfileStore ], + plugins: [externalProfileStore], mocks: { $route: { params: { id: 100 }, @@ -192,7 +192,7 @@ describe.skip('UserProfile', () => { it('renders local profile', () => { const wrapper = mount(UserProfile, { global: { - plugins: [ localProfileStore ], + plugins: [localProfileStore], mocks: { $route: { params: { name: 'testUser' }, |