Fix tests

LibCrowds · Nov 5, 2017 · 8ec71f1 · 8ec71f1
1 parent 77972ee
commit 8ec71f1
Show file tree

Hide file tree

Showing 16 changed files with 137 additions and 169 deletions.
diff --git a/.babelrc b/.babelrc
@@ -19,9 +19,10 @@
       ],
       "plugins": [
         ["module-resolver", {
+          "root": ["./"],
           "alias": {
-            "~": "./",
-            "@": "./"
+            "~": ".",
+            "@": "."
           }
         }]
       ]

diff --git a/components/navbars/App.vue b/components/navbars/App.vue
@@ -48,12 +48,9 @@
             <div role="separator" class="dropdown-divider"></div>
             <b-dropdown-item
               :to="{
-                name: 'project-open',
-                params: {
-                  name: currentUser.name
-                }
+                name: 'project-open'
               }">
-              Projects Admin
+              Project Admin
             </b-dropdown-item>
             <b-dropdown-item
               :to="{

diff --git a/components/navbars/Collection.vue b/components/navbars/Collection.vue
@@ -125,12 +125,9 @@
               <div role="separator" class="dropdown-divider"></div>
               <b-dropdown-item
                 :to="{
-                  name: 'project-open',
-                  params: {
-                    name: currentUser.name
-                  }
+                  name: 'project-open'
                 }">
-                Projects Admin
+                Project Admin
               </b-dropdown-item>
               <b-dropdown-item
                 :to="{

diff --git a/test/fixtures/routes.js b/test/fixtures/routes.js
@@ -130,9 +130,9 @@ export const routes = [
     name: 'project-short_name-settings'
   },
   {
-    path: '/account/:name?/projects',
+    path: '/project/open',
     component: jest.fn(),
-    name: 'account-name-projects'
+    name: 'project-open'
   },
   {
     path: '/account/:name?/announcements',

diff --git a/test/unit/specs/components/buttons/__snapshots__/projectContrib.spec.js.snap b/test/unit/specs/components/buttons/__snapshots__/projectContrib.spec.js.snap
@@ -13,21 +13,7 @@ exports[`ProjectContrib button is active by default 1`] = `
 
 `;
 
-exports[`ProjectContrib button is disabled when status is cannot_completed 1`] = `
-
-<a tabindex="-1"
-   href="#"
-   target="_self"
-   aria-disabled="true"
-   data-server-rendered="true"
-   class="btn btn-success btn-block disabled disabled"
->
-  Contribute
-</a>
-
-`;
-
-exports[`ProjectContrib button is disabled when status is completed 1`] = `
+exports[`ProjectContrib button is disabled when project is completed 1`] = `
 
 <a tabindex="-1"
    href="#"

diff --git a/test/unit/specs/components/buttons/projectContrib.spec.js b/test/unit/specs/components/buttons/projectContrib.spec.js
@@ -28,21 +28,12 @@ describe('ProjectContrib button', () => {
     })
   })
 
-  it('is disabled when status is completed', () => {
+  it('is disabled when project is completed', () => {
+    let completedProject = {
+      overall_progress: 100
+    }
     wrapper.setProps({
-      status: 'completed',
-      shortname: 'my_project'
-    })
-    const renderer = require('vue-server-renderer').createRenderer()
-    renderer.renderToString(wrapper.vm, (err, str) => {
-      expect(str).toMatchSnapshot()
-    })
-  })
-
-  it('is disabled when status is cannot_completed', () => {
-    wrapper.setProps({
-      status: 'cannot_contribute',
-      shortname: 'my_project'
+      project: completedProject
     })
     const renderer = require('vue-server-renderer').createRenderer()
     renderer.renderToString(wrapper.vm, (err, str) => {

diff --git a/test/unit/specs/components/charts/__snapshots__/bar.spec.js.snap b/test/unit/specs/components/charts/__snapshots__/bar.spec.js.snap
@@ -11,11 +11,8 @@ exports[`Bar chart renders correctly 1`] = `
     </div>
   </div>
   <div class="card-body">
-    <vue-chartist type="Bar"
-                  data="[object Object]"
-                  options="[object Object]"
-    >
-    </vue-chartist>
+    <div>
+    </div>
   </div>
 </div>
 

diff --git a/test/unit/specs/components/charts/__snapshots__/line.spec.js.snap b/test/unit/specs/components/charts/__snapshots__/line.spec.js.snap
@@ -11,11 +11,8 @@ exports[`Line chart renders correctly 1`] = `
     </div>
   </div>
   <div class="card-body">
-    <vue-chartist type="Line"
-                  data="[object Object]"
-                  options="[object Object]"
-    >
-    </vue-chartist>
+    <div>
+    </div>
   </div>
 </div>
 

diff --git a/test/unit/specs/components/charts/__snapshots__/pie.spec.js.snap b/test/unit/specs/components/charts/__snapshots__/pie.spec.js.snap
@@ -11,11 +11,8 @@ exports[`Pie chart renders correctly 1`] = `
     </div>
   </div>
   <div class="card-body">
-    <vue-chartist type="Pie"
-                  data="[object Object]"
-                  options="[object Object]"
-    >
-    </vue-chartist>
+    <div>
+    </div>
   </div>
 </div>
 

diff --git a/test/unit/specs/components/navbars/__snapshots__/app.spec.js.snap b/test/unit/specs/components/navbars/__snapshots__/app.spec.js.snap
@@ -25,7 +25,7 @@ exports[`App navbar renders correctly when signed in as admin 1`] = `
       >
         <button id="announcements-toggle"
                 type="button"
-                class="nav-item d-none d-lg-flex flex-row btn btn-secondary"
+                class="nav-link d-none d-lg-flex flex-row btn btn-secondary"
         >
           <icon name="bell">
           </icon>
@@ -94,25 +94,19 @@ exports[`App navbar renders correctly when signed in as admin 1`] = `
                  class="dropdown-divider"
             >
             </div>
-            <a href="#/account/JohnDoe/projects"
+            <a href="#/project/open"
                role="menuitem"
                target="_self"
                class="dropdown-item"
             >
-              Open Project
+              Project Admin
             </a>
-          </span>
-          <span>
-            <div role="separator"
-                 class="dropdown-divider"
-            >
-            </div>
             <a href="#/admin/dashboard"
                role="menuitem"
                target="_self"
                class="dropdown-item"
             >
-              Admin
+              Site Admin
             </a>
           </span>
           <div role="separator"
@@ -160,7 +154,7 @@ exports[`App navbar renders correctly when signed in as non-admin 1`] = `
       >
         <button id="announcements-toggle"
                 type="button"
-                class="nav-item d-none d-lg-flex flex-row btn btn-secondary"
+                class="nav-link d-none d-lg-flex flex-row btn btn-secondary"
         >
           <icon name="bell">
           </icon>
@@ -225,7 +219,6 @@ exports[`App navbar renders correctly when signed in as non-admin 1`] = `
             Settings
           </a>
           <!---->
-          <!---->
           <div role="separator"
                class="dropdown-divider"
           >