From 444f01f879870d83745eec2249194c596f2ccb89 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 12 Apr 2019 08:34:06 -0300
Subject: [PATCH] Refactor test, component

- Remove redundant code
- change socialMediaUrl to add the attributes().href since that's the url
- grab last element of url as username, makes an assumption, but a safer one
---
 webapp/pages/profile/_id/_slug.vue            | 58 +++++++++----------
 webapp/pages/settings/my-social-media.spec.js |  4 +-
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 797645574..ae66c252d 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -202,39 +202,37 @@
             </p>
           </template>
         </ds-card>
-        <ds-space />
         <ds-space 
           v-if="user.socialMedia && user.socialMedia.length"
-          margin="x-small"
-        />
-        <ds-card style="position: relative; height: auto;">
-          <ds-space
-            v-if="user.socialMedia && user.socialMedia.length"
-            margin="x-small"
-          >
-            <ds-text
-              tag="h5"
-              color="soft"
+          margin="large"
+        >
+          <ds-card style="position: relative; height: auto;">
+            <ds-space
+              margin="x-small"
             >
-              {{ $t('profile.socialMedia') }} {{ user.name | truncate(15) }}?
-            </ds-text>
-            <template v-if="user.socialMedia && user.socialMedia.length">
-              <ds-space
-                v-for="link in socialMediaLinks"
-                :key="link.username"
-                margin="x-small"
+              <ds-text
+                tag="h5"
+                color="soft"
               >
-                <!-- TODO: find better solution for rendering errors -->
-                <a :href="link.url">
-                  <ds-avatar
-                    :image="link.favicon"
-                  />
-                  {{ link.username }}
-                </a>
-              </ds-space>
-            </template>
-          </ds-space>
-        </ds-card>
+                {{ $t('profile.socialMedia') }} {{ user.name | truncate(15) }}?
+              </ds-text>
+              <template>
+                <ds-space
+                  v-for="link in socialMediaLinks"
+                  :key="link.username"
+                  margin="x-small"
+                >
+                  <a :href="link.url">
+                    <ds-avatar
+                      :image="link.favicon"
+                    />
+                    {{ link.username }}
+                  </a>
+                </ds-space>
+              </template>
+            </ds-space>
+          </ds-card>
+        </ds-space>
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', sm: 3, md: 5, lg: 3 }">
         <ds-flex
@@ -391,7 +389,7 @@ export default {
         )
         const [domain] = matches || []
         const favicon = domain ? `${domain}/favicon.ico` : null
-        const username = url.split('/')[3]
+        const username = url.split('/').pop()
         return { url, username, favicon }
       })
     }
diff --git a/webapp/pages/settings/my-social-media.spec.js b/webapp/pages/settings/my-social-media.spec.js
index c8fc45d31..4f48a2835 100644
--- a/webapp/pages/settings/my-social-media.spec.js
+++ b/webapp/pages/settings/my-social-media.spec.js
@@ -68,8 +68,8 @@ describe('my-social-media.vue', () => {
 
       it("displays a link to the currentUser's social media", () => {
         wrapper = Wrapper()
-        const socialMediaLink = wrapper.find('a')
-        expect(socialMediaLink.attributes().href).toBe(socialMediaUrl)
+        const socialMediaLink = wrapper.find('a').attributes().href
+        expect(socialMediaLink).toBe(socialMediaUrl)
       })
     })