From 7b3fde25a36784fde26bffb1044cf0f93143229f Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Sun, 10 Mar 2019 21:53:08 +0200
Subject: [PATCH 01/20] Cypress test - dashboard create/archive

---
 .../app/components/app-header/app-header.html |  2 +-
 .../dashboards/edit-dashboard-dialog.html     | 32 +++++++++--------
 client/app/pages/dashboards/dashboard.html    |  2 +-
 .../dashboard/create_dashboard_spec.js        | 36 +++++++++++++++++++
 4 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100644 cypress/integration/dashboard/create_dashboard_spec.js

diff --git a/client/app/components/app-header/app-header.html b/client/app/components/app-header/app-header.html
index ea35732b14..f4dbb6e8dd 100644
--- a/client/app/components/app-header/app-header.html
+++ b/client/app/components/app-header/app-header.html
@@ -67,7 +67,7 @@
 
       <!-- Add New Button -->
       <div class="btn-group navbar-btn navbar-left btn__new hidden-xs" uib-dropdown is-open="status.isopen">
-        <button id="create-button" type="button" class="btn btn-primary btn--create" uib-dropdown-toggle ng-disabled="disabled">
+        <button id="create-button" data-test="CreateButton" type="button" class="btn btn-primary btn--create" uib-dropdown-toggle ng-disabled="disabled">
           Create <span class="caret caret--nav"></span>
         </button>
         <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="create-button">
diff --git a/client/app/components/dashboards/edit-dashboard-dialog.html b/client/app/components/dashboards/edit-dashboard-dialog.html
index 4ca72de81a..684e0885a8 100644
--- a/client/app/components/dashboards/edit-dashboard-dialog.html
+++ b/client/app/components/dashboards/edit-dashboard-dialog.html
@@ -1,17 +1,19 @@
-<div class="modal-header">
-  <button type="button" class="close" ng-click="$ctrl.dismiss()" ng-disabled="$ctrl.saveInProgress" aria-hidden="true">&times;</button>
-  <h4 class="modal-title">New Dashboard</h4>
-</div>
-<div class="modal-body" ng-if="$ctrl.policy.isCreateDashboardEnabled()">
-  <p>
-    <input type="text" class="form-control" placeholder="Dashboard Name" ng-model="$ctrl.dashboard.name" autofocus ng-keyup="$event.keyCode === 13 && $ctrl.saveDashboard()">
-  </p>
-</div>
-<div class="modal-footer" ng-if="$ctrl.policy.isCreateDashboardEnabled()">
-  <button type="button" class="btn btn-default" ng-disabled="$ctrl.saveInProgress" ng-click="$ctrl.dismiss()">Close</button>
-  <button type="button" class="btn btn-primary" ng-disabled="$ctrl.saveInProgress || !$ctrl.isFormValid()" ng-click="$ctrl.saveDashboard()">Save</button>
-</div>
+<div data-test="EditDashboardDialog">
+  <div class="modal-header">
+    <button type="button" class="close" ng-click="$ctrl.dismiss()" ng-disabled="$ctrl.saveInProgress" aria-hidden="true">&times;</button>
+    <h4 class="modal-title">New Dashboard</h4>
+  </div>
+  <div class="modal-body" ng-if="$ctrl.policy.isCreateDashboardEnabled()">
+    <p>
+      <input type="text" class="form-control" placeholder="Dashboard Name" ng-model="$ctrl.dashboard.name" autofocus ng-keyup="$event.keyCode === 13 && $ctrl.saveDashboard()">
+    </p>
+  </div>
+  <div class="modal-footer" ng-if="$ctrl.policy.isCreateDashboardEnabled()">
+    <button type="button" class="btn btn-default" ng-disabled="$ctrl.saveInProgress" ng-click="$ctrl.dismiss()">Close</button>
+    <button type="button" class="btn btn-primary" ng-disabled="$ctrl.saveInProgress || !$ctrl.isFormValid()" ng-click="$ctrl.saveDashboard()" data-test="DashboardSaveButton">Save</button>
+  </div>
 
-<div class="modal-body" ng-if="!$ctrl.policy.isCreateDashboardEnabled()">
-  <edit-dashboard-dialog-disabled></edit-dashboard-dialog-disabled>
+  <div class="modal-body" ng-if="!$ctrl.policy.isCreateDashboardEnabled()">
+    <edit-dashboard-dialog-disabled></edit-dashboard-dialog-disabled>
+  </div>
 </div>
\ No newline at end of file
diff --git a/client/app/pages/dashboards/dashboard.html b/client/app/pages/dashboards/dashboard.html
index 715a9f105e..29d3b7d1db 100644
--- a/client/app/pages/dashboards/dashboard.html
+++ b/client/app/pages/dashboards/dashboard.html
@@ -61,7 +61,7 @@ <h3>
           </button>
       </span>
 
-      <div class="btn-group hidden-print hidden-xs" role="group" ng-show="$ctrl.dashboard.canEdit()" uib-dropdown ng-if="!$ctrl.dashboard.is_archived && !$ctrl.layoutEditing">
+      <div class="btn-group hidden-print hidden-xs" role="group" ng-show="$ctrl.dashboard.canEdit()" uib-dropdown ng-if="!$ctrl.dashboard.is_archived && !$ctrl.layoutEditing" data-test="DashboardMoreMenu">
         <button class="btn btn-default btn-sm dropdown-toggle" uib-dropdown-toggle>
           <span class="zmdi zmdi-more"></span>
         </button>
diff --git a/cypress/integration/dashboard/create_dashboard_spec.js b/cypress/integration/dashboard/create_dashboard_spec.js
new file mode 100644
index 0000000000..cbafd047a2
--- /dev/null
+++ b/cypress/integration/dashboard/create_dashboard_spec.js
@@ -0,0 +1,36 @@
+describe('Create Dashboard', () => {
+  beforeEach(() => {
+    cy.login();
+    cy.visit('/dashboards');
+  });
+
+  it('create new', () => {
+    cy.getByTestId('CreateButton').click();
+    cy.get('li[role="menuitem"').contains('Dashboard').click();
+    cy.getByTestId('EditDashboardDialog').within(() => {
+      cy.getByTestId('DashboardSaveButton').should('be.disabled');
+      cy.get('input').type('Foo Bar');
+      cy.getByTestId('DashboardSaveButton').click();
+    });
+    cy.url().should('include', '/dashboard/foo-bar');
+
+    cy.visit('/dashboards');
+    cy.get('.table-main-title').contains('Foo Bar').should('exist');
+  });
+
+  it('archive', () => {
+    cy.get('.table-main-title[href*="dashboard/foo-bar"]').as('listItem');
+    cy.get('@listItem').click();
+    cy.getByTestId('DashboardMoreMenu')
+      .click()
+      .within(() => {
+        cy.get('li').contains('Archive').click();
+      });
+
+    cy.get('.btn-warning').contains('Archive').click();
+    cy.get('.label-tag-archived').should('exist');
+    
+    cy.visit('/dashboards');
+    cy.get('@listItem').should('not.exist');
+  });
+});

From 8b3b49d3f4d1c75b022d77df5feee9ad155f2b11 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Mon, 11 Mar 2019 06:44:04 +0200
Subject: [PATCH 02/20] Update
 cypress/integration/dashboard/create_dashboard_spec.js

Co-Authored-By: ranbena <ranbena@gmail.com>
---
 cypress/integration/dashboard/create_dashboard_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/dashboard/create_dashboard_spec.js b/cypress/integration/dashboard/create_dashboard_spec.js
index cbafd047a2..1090be5536 100644
--- a/cypress/integration/dashboard/create_dashboard_spec.js
+++ b/cypress/integration/dashboard/create_dashboard_spec.js
@@ -4,7 +4,7 @@ describe('Create Dashboard', () => {
     cy.visit('/dashboards');
   });
 
-  it('create new', () => {
+  it('creates a new dashboard', () => {
     cy.getByTestId('CreateButton').click();
     cy.get('li[role="menuitem"').contains('Dashboard').click();
     cy.getByTestId('EditDashboardDialog').within(() => {

From 8a173d1a0438720d8f22e3ebeeb58767fbf0983b Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Mon, 11 Mar 2019 09:09:28 +0200
Subject: [PATCH 03/20] Changed to one test, based partially on snapshots

---
 .../dashboard/create_dashboard_spec.js        | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/cypress/integration/dashboard/create_dashboard_spec.js b/cypress/integration/dashboard/create_dashboard_spec.js
index 1090be5536..6452d5ca23 100644
--- a/cypress/integration/dashboard/create_dashboard_spec.js
+++ b/cypress/integration/dashboard/create_dashboard_spec.js
@@ -1,36 +1,43 @@
-describe('Create Dashboard', () => {
+function createNewDashboard(dashboardName) {
+  cy.getByTestId('CreateButton').click();
+  cy.get('li[role="menuitem"').contains('Dashboard').click();
+  cy.getByTestId('EditDashboardDialog').within(() => {
+    cy.getByTestId('DashboardSaveButton').should('be.disabled');
+    cy.get('input').type(dashboardName);
+    cy.getByTestId('DashboardSaveButton').click();
+  });
+}
+
+function archiveCurrentDashboard() {
+  cy.getByTestId('DashboardMoreMenu').click().within(() => {
+    cy.get('li').contains('Archive').click();
+  });
+
+  cy.get('.btn-warning').contains('Archive').click();
+  cy.get('.label-tag-archived').should('exist');
+}
+
+describe('Dashboard', () => {
   beforeEach(() => {
     cy.login();
     cy.visit('/dashboards');
   });
 
-  it('creates a new dashboard', () => {
-    cy.getByTestId('CreateButton').click();
-    cy.get('li[role="menuitem"').contains('Dashboard').click();
-    cy.getByTestId('EditDashboardDialog').within(() => {
-      cy.getByTestId('DashboardSaveButton').should('be.disabled');
-      cy.get('input').type('Foo Bar');
-      cy.getByTestId('DashboardSaveButton').click();
-    });
+  it('creates a new dashboard and archives it', () => {
+    createNewDashboard('Foo Bar');
     cy.url().should('include', '/dashboard/foo-bar');
 
     cy.visit('/dashboards');
-    cy.get('.table-main-title').contains('Foo Bar').should('exist');
-  });
+    cy.percySnapshot('Dashboards List');
+
+    cy.get('.table-main-title[href*="dashboard/foo-bar"]')
+      .should('exist')
+      .and('contain', 'Foo Bar')
+      .click();
+
+    archiveCurrentDashboard();
 
-  it('archive', () => {
-    cy.get('.table-main-title[href*="dashboard/foo-bar"]').as('listItem');
-    cy.get('@listItem').click();
-    cy.getByTestId('DashboardMoreMenu')
-      .click()
-      .within(() => {
-        cy.get('li').contains('Archive').click();
-      });
-
-    cy.get('.btn-warning').contains('Archive').click();
-    cy.get('.label-tag-archived').should('exist');
-    
     cy.visit('/dashboards');
-    cy.get('@listItem').should('not.exist');
+    cy.percySnapshot('Dashboards List');
   });
 });

From fbe2b5655be796c8187cf86d3d6d68d159353acc Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Mon, 11 Mar 2019 22:47:50 +0200
Subject: [PATCH 04/20] Added snapshot plugin

---
 cypress/plugins/index.js | 7 ++++++-
 cypress/support/index.js | 1 +
 package.json             | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
index cc40a4649c..d245ad73cd 100644
--- a/cypress/plugins/index.js
+++ b/cypress/plugins/index.js
@@ -1 +1,6 @@
-module.exports = () => {};
+const { initPlugin } = require('cypress-plugin-snapshots/plugin');
+
+module.exports = (on, config) => {
+  initPlugin(on, config);
+  return config;
+};
diff --git a/cypress/support/index.js b/cypress/support/index.js
index 1221b17e09..8eb18d8ffa 100644
--- a/cypress/support/index.js
+++ b/cypress/support/index.js
@@ -1 +1,2 @@
 import './commands';
+import 'cypress-plugin-snapshots/commands';
diff --git a/package.json b/package.json
index 620281bae0..2ae4bb8a38 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "lint:base": "eslint --config ./client/.eslintrc.js",
     "test": "TZ=Africa/Khartoum jest",
     "test:watch": "jest --watch",
-    "cypress:install": "npm install --no-save cypress@^3.1.5 @percy/cypress@^0.2.3 atob@2.1.2",
+    "cypress:install": "npm install --no-save cypress@^3.1.5 @percy/cypress@^0.2.3 cypress-plugin-snapshots@^1.2.6 atob@2.1.2 ",
     "cypress": "node cypress/cypress.js"
   },
   "repository": {

From a027ad5485fd938329358fa86105b3c3a2424ea7 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Mon, 11 Mar 2019 22:48:51 +0200
Subject: [PATCH 05/20] Improved test

---
 client/app/pages/dashboards/DashboardList.jsx | 56 ++++++-------
 .../create_dashboard_spec.js.snap             | 79 +++++++++++++++++++
 .../dashboard/create_dashboard_spec.js        | 20 +++--
 3 files changed, 121 insertions(+), 34 deletions(-)
 create mode 100644 cypress/integration/dashboard/__snapshots__/create_dashboard_spec.js.snap

diff --git a/client/app/pages/dashboards/DashboardList.jsx b/client/app/pages/dashboards/DashboardList.jsx
index d388132e82..038fde14cd 100644
--- a/client/app/pages/dashboards/DashboardList.jsx
+++ b/client/app/pages/dashboards/DashboardList.jsx
@@ -88,35 +88,35 @@ class DashboardList extends React.Component {
             />
           </Layout.Sidebar>
           <Layout.Content>
-            {!controller.isLoaded && <LoadingState />}
-            {
-              controller.isLoaded && controller.isEmpty && (
-                <DashboardListEmptyState
-                  page={controller.params.currentPage}
-                  searchTerm={controller.searchTerm}
-                  selectedTags={controller.selectedTags}
-                />
-              )
-            }
-            {
-              controller.isLoaded && !controller.isEmpty && (
-                <div className="bg-white tiled table-responsive">
-                  <ItemsTable
-                    items={controller.pageItems}
-                    columns={this.listColumns}
-                    orderByField={controller.orderByField}
-                    orderByReverse={controller.orderByReverse}
-                    toggleSorting={controller.toggleSorting}
+            {controller.isLoaded ? (
+              <div data-test="DashboardLayoutContent">
+                {controller.isEmpty ? (
+                  <DashboardListEmptyState
+                    page={controller.params.currentPage}
+                    searchTerm={controller.searchTerm}
+                    selectedTags={controller.selectedTags}
                   />
-                  <Paginator
-                    totalCount={controller.totalItemsCount}
-                    itemsPerPage={controller.itemsPerPage}
-                    page={controller.page}
-                    onChange={page => controller.updatePagination({ page })}
-                  />
-                </div>
-              )
-            }
+                ) : (
+                  <div className="bg-white tiled table-responsive">
+                    <ItemsTable
+                      items={controller.pageItems}
+                      columns={this.listColumns}
+                      orderByField={controller.orderByField}
+                      orderByReverse={controller.orderByReverse}
+                      toggleSorting={controller.toggleSorting}
+                    />
+                    <Paginator
+                      totalCount={controller.totalItemsCount}
+                      itemsPerPage={controller.itemsPerPage}
+                      page={controller.page}
+                      onChange={page => controller.updatePagination({ page })}
+                    />
+                  </div>
+                )}
+              </div>
+            ) : (
+              <LoadingState />
+            )}
           </Layout.Content>
         </Layout>
       </div>
diff --git a/cypress/integration/dashboard/__snapshots__/create_dashboard_spec.js.snap b/cypress/integration/dashboard/__snapshots__/create_dashboard_spec.js.snap
new file mode 100644
index 0000000000..2546e6efaa
--- /dev/null
+++ b/cypress/integration/dashboard/__snapshots__/create_dashboard_spec.js.snap
@@ -0,0 +1,79 @@
+exports[`Dashboard > creates a new dashboard and archives it #0`] = `
+<div data-test="DashboardLayoutContent">
+  <div class="empty-state bg-white tiled">
+    <div class="empty-state__summary">
+      <h2><i class="zmdi zmdi-view-quilt"></i></h2>
+      <p>See the big picture</p>
+      <img
+        src="/static/images/illustrations/dashboard.svg"
+        alt="dashboard Illustration"
+        width="75%"
+      />
+    </div>
+    <div class="empty-state__steps">
+      <h4>Let's get started</h4>
+      <ol>
+        <li class="done">
+          <a href="data_sources/new">Connect</a> a Data Source
+        </li>
+        <li class=""><a href="queries/new">Create</a> your first Query</li>
+        <li class="">
+          <a href="javascript:void(0)">Create</a> your first Dashboard
+        </li>
+      </ol>
+      <p>
+        Need more support?
+        <a
+          href="https://help.redash.io/category/22-dashboards"
+          target="_blank"
+          rel="noopener noreferrer"
+          >See our Help<i
+            class="fa fa-external-link m-l-5"
+            aria-hidden="true"
+          ></i
+        ></a>
+      </p>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Dashboard > creates a new dashboard and archives it #1`] = `
+<div data-test="DashboardLayoutContent">
+  <div class="empty-state bg-white tiled">
+    <div class="empty-state__summary">
+      <h2><i class="zmdi zmdi-view-quilt"></i></h2>
+      <p>See the big picture</p>
+      <img
+        src="/static/images/illustrations/dashboard.svg"
+        alt="dashboard Illustration"
+        width="75%"
+      />
+    </div>
+    <div class="empty-state__steps">
+      <h4>Let's get started</h4>
+      <ol>
+        <li class="done">
+          <a href="data_sources/new">Connect</a> a Data Source
+        </li>
+        <li class=""><a href="queries/new">Create</a> your first Query</li>
+        <li class="">
+          <a href="javascript:void(0)">Create</a> your first Dashboard
+        </li>
+      </ol>
+      <p>
+        Need more support?
+        <a
+          href="https://help.redash.io/category/22-dashboards"
+          target="_blank"
+          rel="noopener noreferrer"
+          >See our Help<i
+            class="fa fa-external-link m-l-5"
+            aria-hidden="true"
+          ></i
+        ></a>
+      </p>
+    </div>
+  </div>
+</div>
+`;
diff --git a/cypress/integration/dashboard/create_dashboard_spec.js b/cypress/integration/dashboard/create_dashboard_spec.js
index 6452d5ca23..210db34aec 100644
--- a/cypress/integration/dashboard/create_dashboard_spec.js
+++ b/cypress/integration/dashboard/create_dashboard_spec.js
@@ -24,20 +24,28 @@ describe('Dashboard', () => {
   });
 
   it('creates a new dashboard and archives it', () => {
+    cy.getByTestId('DashboardLayoutContent').as('content');
+    cy.get('@content').toMatchSnapshot(); // TODO: make this overwrite https://git.io/fhjRW
+
     createNewDashboard('Foo Bar');
-    cy.url().should('include', '/dashboard/foo-bar');
 
-    cy.visit('/dashboards');
-    cy.percySnapshot('Dashboards List');
+    let urlPath;
+    cy.location().should(({ pathname }) => {
+      urlPath = pathname;
+      expect(pathname).to.include('dashboard/foo-bar');
+    });
 
-    cy.get('.table-main-title[href*="dashboard/foo-bar"]')
+    cy.visit('/dashboards');
+    cy.get('@content').within(() => {
+      cy.get('.table-main-title')
       .should('exist')
-      .and('contain', 'Foo Bar')
+      .and('have.attr', 'href', urlPath.substring(1))
       .click();
+    });
 
     archiveCurrentDashboard();
 
     cy.visit('/dashboards');
-    cy.percySnapshot('Dashboards List');
+    cy.get('@content').toMatchSnapshot();
   });
 });

From 78898cd6d4ed57e0af3de4d230aece9c537d842a Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Mon, 11 Mar 2019 23:18:04 +0200
Subject: [PATCH 06/20] Updated circleci cypress installation

---
 .circleci/Dockerfile.cypress | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/Dockerfile.cypress b/.circleci/Dockerfile.cypress
index bce08d28c5..7a2af6ab8a 100644
--- a/.circleci/Dockerfile.cypress
+++ b/.circleci/Dockerfile.cypress
@@ -3,7 +3,7 @@ FROM cypress/browsers:chrome67
 ENV APP /usr/src/app
 WORKDIR $APP
 
-RUN npm install --no-save puppeteer@1.10.0 cypress@^3.1.5 @percy/cypress@^0.2.3 atob@2.1.2 > /dev/null
+RUN npm install --no-save puppeteer@1.10.0 cypress@^3.1.5 @percy/cypress@^0.2.3 cypress-plugin-snapshots@^1.2.6 atob@2.1.2 > /dev/null
 
 COPY cypress $APP/cypress
 COPY cypress.json $APP/cypress.json

From aaa5068358f1cc126e70c458986f2777c6855076 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Tue, 12 Mar 2019 08:57:15 +0200
Subject: [PATCH 07/20] Update .circleci/Dockerfile.cypress

Co-Authored-By: ranbena <ranbena@gmail.com>
---
 .circleci/Dockerfile.cypress | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/Dockerfile.cypress b/.circleci/Dockerfile.cypress
index 7a2af6ab8a..ac8efd848b 100644
--- a/.circleci/Dockerfile.cypress
+++ b/.circleci/Dockerfile.cypress
@@ -3,7 +3,8 @@ FROM cypress/browsers:chrome67
 ENV APP /usr/src/app
 WORKDIR $APP
 
-RUN npm install --no-save puppeteer@1.10.0 cypress@^3.1.5 @percy/cypress@^0.2.3 cypress-plugin-snapshots@^1.2.6 atob@2.1.2 > /dev/null
+COPY package.json $APP/package.json
+RUN npm run cypress:install > /dev/null
 
 COPY cypress $APP/cypress
 COPY cypress.json $APP/cypress.json

From 09e7cd56873107c8c187cff0fb32e45966b926f4 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Tue, 12 Mar 2019 09:20:41 +0200
Subject: [PATCH 08/20] Update
 cypress/integration/dashboard/create_dashboard_spec.js

Co-Authored-By: ranbena <ranbena@gmail.com>
---
 cypress/integration/dashboard/create_dashboard_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/dashboard/create_dashboard_spec.js b/cypress/integration/dashboard/create_dashboard_spec.js
index 210db34aec..ba996ff618 100644
--- a/cypress/integration/dashboard/create_dashboard_spec.js
+++ b/cypress/integration/dashboard/create_dashboard_spec.js
@@ -1,6 +1,6 @@
 function createNewDashboard(dashboardName) {
   cy.getByTestId('CreateButton').click();
-  cy.get('li[role="menuitem"').contains('Dashboard').click();
+  cy.get('li[role="menuitem]"').contains('Dashboard').click();
   cy.getByTestId('EditDashboardDialog').within(() => {
     cy.getByTestId('DashboardSaveButton').should('be.disabled');
     cy.get('input').type(dashboardName);

From 265e5fb1ee70ce8d799314f11692f09f1467a1c4 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Tue, 12 Mar 2019 09:29:44 +0200
Subject: [PATCH 09/20] Fixed lint

---
 cypress/integration/dashboard/create_dashboard_spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cypress/integration/dashboard/create_dashboard_spec.js b/cypress/integration/dashboard/create_dashboard_spec.js
index ba996ff618..3927a17d10 100644
--- a/cypress/integration/dashboard/create_dashboard_spec.js
+++ b/cypress/integration/dashboard/create_dashboard_spec.js
@@ -38,9 +38,9 @@ describe('Dashboard', () => {
     cy.visit('/dashboards');
     cy.get('@content').within(() => {
       cy.get('.table-main-title')
-      .should('exist')
-      .and('have.attr', 'href', urlPath.substring(1))
-      .click();
+        .should('exist')
+        .and('have.attr', 'href', urlPath.substring(1))
+        .click();
     });
 
     archiveCurrentDashboard();

From 27757a9ff55f132be0371b499deeeb7f64c53b8a Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Tue, 12 Mar 2019 09:40:30 +0200
Subject: [PATCH 10/20] Whoops

---
 cypress/integration/dashboard/create_dashboard_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/dashboard/create_dashboard_spec.js b/cypress/integration/dashboard/create_dashboard_spec.js
index 3927a17d10..b37743075a 100644
--- a/cypress/integration/dashboard/create_dashboard_spec.js
+++ b/cypress/integration/dashboard/create_dashboard_spec.js
@@ -1,6 +1,6 @@
 function createNewDashboard(dashboardName) {
   cy.getByTestId('CreateButton').click();
-  cy.get('li[role="menuitem]"').contains('Dashboard').click();
+  cy.get('li[role="menuitem"]').contains('Dashboard').click();
   cy.getByTestId('EditDashboardDialog').within(() => {
     cy.getByTestId('DashboardSaveButton').should('be.disabled');
     cy.get('input').type(dashboardName);

From eb5b5ac28d5291fa0acd8032a0cb5cc22f008773 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Tue, 12 Mar 2019 15:09:47 +0200
Subject: [PATCH 11/20] Reverted snapshots, added cleanup to tests

---
 .../create_dashboard_spec.js.snap             | 79 -------------------
 .../dashboard/create_dashboard_spec.js        | 47 +++++++----
 cypress/plugins/index.js                      |  7 +-
 cypress/support/index.js                      |  1 -
 package.json                                  |  2 +-
 5 files changed, 33 insertions(+), 103 deletions(-)
 delete mode 100644 cypress/integration/dashboard/__snapshots__/create_dashboard_spec.js.snap

diff --git a/cypress/integration/dashboard/__snapshots__/create_dashboard_spec.js.snap b/cypress/integration/dashboard/__snapshots__/create_dashboard_spec.js.snap
deleted file mode 100644
index 2546e6efaa..0000000000
--- a/cypress/integration/dashboard/__snapshots__/create_dashboard_spec.js.snap
+++ /dev/null
@@ -1,79 +0,0 @@
-exports[`Dashboard > creates a new dashboard and archives it #0`] = `
-<div data-test="DashboardLayoutContent">
-  <div class="empty-state bg-white tiled">
-    <div class="empty-state__summary">
-      <h2><i class="zmdi zmdi-view-quilt"></i></h2>
-      <p>See the big picture</p>
-      <img
-        src="/static/images/illustrations/dashboard.svg"
-        alt="dashboard Illustration"
-        width="75%"
-      />
-    </div>
-    <div class="empty-state__steps">
-      <h4>Let's get started</h4>
-      <ol>
-        <li class="done">
-          <a href="data_sources/new">Connect</a> a Data Source
-        </li>
-        <li class=""><a href="queries/new">Create</a> your first Query</li>
-        <li class="">
-          <a href="javascript:void(0)">Create</a> your first Dashboard
-        </li>
-      </ol>
-      <p>
-        Need more support?
-        <a
-          href="https://help.redash.io/category/22-dashboards"
-          target="_blank"
-          rel="noopener noreferrer"
-          >See our Help<i
-            class="fa fa-external-link m-l-5"
-            aria-hidden="true"
-          ></i
-        ></a>
-      </p>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`Dashboard > creates a new dashboard and archives it #1`] = `
-<div data-test="DashboardLayoutContent">
-  <div class="empty-state bg-white tiled">
-    <div class="empty-state__summary">
-      <h2><i class="zmdi zmdi-view-quilt"></i></h2>
-      <p>See the big picture</p>
-      <img
-        src="/static/images/illustrations/dashboard.svg"
-        alt="dashboard Illustration"
-        width="75%"
-      />
-    </div>
-    <div class="empty-state__steps">
-      <h4>Let's get started</h4>
-      <ol>
-        <li class="done">
-          <a href="data_sources/new">Connect</a> a Data Source
-        </li>
-        <li class=""><a href="queries/new">Create</a> your first Query</li>
-        <li class="">
-          <a href="javascript:void(0)">Create</a> your first Dashboard
-        </li>
-      </ol>
-      <p>
-        Need more support?
-        <a
-          href="https://help.redash.io/category/22-dashboards"
-          target="_blank"
-          rel="noopener noreferrer"
-          >See our Help<i
-            class="fa fa-external-link m-l-5"
-            aria-hidden="true"
-          ></i
-        ></a>
-      </p>
-    </div>
-  </div>
-</div>
-`;
diff --git a/cypress/integration/dashboard/create_dashboard_spec.js b/cypress/integration/dashboard/create_dashboard_spec.js
index b37743075a..05252165d1 100644
--- a/cypress/integration/dashboard/create_dashboard_spec.js
+++ b/cypress/integration/dashboard/create_dashboard_spec.js
@@ -1,4 +1,18 @@
+function archiveAllDashboards() {
+  cy.visit('/dashboards');
+  
+  // archive all dashboards
+  cy.getByTestId('DashboardLayoutContent').then(($wrapper) => {
+    $wrapper
+      .find('.table-main-title')
+      .each((_, { href }) => {
+        archiveDashboard(href);
+      });
+  });
+}
+
 function createNewDashboard(dashboardName) {
+  cy.visit('/dashboards');
   cy.getByTestId('CreateButton').click();
   cy.get('li[role="menuitem"]').contains('Dashboard').click();
   cy.getByTestId('EditDashboardDialog').within(() => {
@@ -8,11 +22,15 @@ function createNewDashboard(dashboardName) {
   });
 }
 
-function archiveCurrentDashboard() {
+function archiveDashboard(url) {
+  if (url) {
+    cy.visit(url);
+  }
+
   cy.getByTestId('DashboardMoreMenu').click().within(() => {
     cy.get('li').contains('Archive').click();
   });
-
+  
   cy.get('.btn-warning').contains('Archive').click();
   cy.get('.label-tag-archived').should('exist');
 }
@@ -20,32 +38,29 @@ function archiveCurrentDashboard() {
 describe('Dashboard', () => {
   beforeEach(() => {
     cy.login();
-    cy.visit('/dashboards');
+    archiveAllDashboards();
   });
 
   it('creates a new dashboard and archives it', () => {
-    cy.getByTestId('DashboardLayoutContent').as('content');
-    cy.get('@content').toMatchSnapshot(); // TODO: make this overwrite https://git.io/fhjRW
-
+    // create new
     createNewDashboard('Foo Bar');
 
-    let urlPath;
-    cy.location().should(({ pathname }) => {
-      urlPath = pathname;
-      expect(pathname).to.include('dashboard/foo-bar');
-    });
-
+    // verify listed in dashboards
     cy.visit('/dashboards');
-    cy.get('@content').within(() => {
+    cy.getByTestId('DashboardLayoutContent').within(() => {
       cy.get('.table-main-title')
+        .contains('Foo Bar')
         .should('exist')
-        .and('have.attr', 'href', urlPath.substring(1))
         .click();
     });
 
-    archiveCurrentDashboard();
+    // archive
+    archiveDashboard();
 
+    // verify not listed in dashboards
     cy.visit('/dashboards');
-    cy.get('@content').toMatchSnapshot();
+    cy.getByTestId('DashboardLayoutContent').within(() => {
+      cy.get('.table-main-title').should('not.exist');
+    });
   });
 });
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
index d245ad73cd..06b946228a 100644
--- a/cypress/plugins/index.js
+++ b/cypress/plugins/index.js
@@ -1,6 +1 @@
-const { initPlugin } = require('cypress-plugin-snapshots/plugin');
-
-module.exports = (on, config) => {
-  initPlugin(on, config);
-  return config;
-};
+module.exports = () => {};
\ No newline at end of file
diff --git a/cypress/support/index.js b/cypress/support/index.js
index 8eb18d8ffa..1221b17e09 100644
--- a/cypress/support/index.js
+++ b/cypress/support/index.js
@@ -1,2 +1 @@
 import './commands';
-import 'cypress-plugin-snapshots/commands';
diff --git a/package.json b/package.json
index 2ae4bb8a38..2f0c4affb0 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "lint:base": "eslint --config ./client/.eslintrc.js",
     "test": "TZ=Africa/Khartoum jest",
     "test:watch": "jest --watch",
-    "cypress:install": "npm install --no-save cypress@^3.1.5 @percy/cypress@^0.2.3 cypress-plugin-snapshots@^1.2.6 atob@2.1.2 ",
+    "cypress:install": "npm install --no-save cypress@^3.1.5 @percy/cypress@^0.2.3 atob@2.1.2 ",
     "cypress": "node cypress/cypress.js"
   },
   "repository": {

From b6b6ebe7a2b2bf5eb832392783e4fc7254bc3915 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Tue, 12 Mar 2019 15:11:06 +0200
Subject: [PATCH 12/20] Renamed spec file

---
 .../dashboard/{create_dashboard_spec.js => dashboard_spec.js}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename cypress/integration/dashboard/{create_dashboard_spec.js => dashboard_spec.js} (100%)

diff --git a/cypress/integration/dashboard/create_dashboard_spec.js b/cypress/integration/dashboard/dashboard_spec.js
similarity index 100%
rename from cypress/integration/dashboard/create_dashboard_spec.js
rename to cypress/integration/dashboard/dashboard_spec.js

From 4ddc1343f15ca24aaff87a93e208a35429da3cdf Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Tue, 12 Mar 2019 15:18:14 +0200
Subject: [PATCH 13/20] White space removal / prettier

---
 .../integration/dashboard/dashboard_spec.js   | 32 +++++++++++--------
 cypress/plugins/index.js                      |  2 +-
 package.json                                  |  2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/cypress/integration/dashboard/dashboard_spec.js b/cypress/integration/dashboard/dashboard_spec.js
index 05252165d1..cfd27064f5 100644
--- a/cypress/integration/dashboard/dashboard_spec.js
+++ b/cypress/integration/dashboard/dashboard_spec.js
@@ -1,20 +1,20 @@
 function archiveAllDashboards() {
   cy.visit('/dashboards');
-  
+
   // archive all dashboards
-  cy.getByTestId('DashboardLayoutContent').then(($wrapper) => {
-    $wrapper
-      .find('.table-main-title')
-      .each((_, { href }) => {
-        archiveDashboard(href);
-      });
+  cy.getByTestId('DashboardLayoutContent').then($wrapper => {
+    $wrapper.find('.table-main-title').each((_, { href }) => {
+      archiveDashboard(href);
+    });
   });
 }
 
 function createNewDashboard(dashboardName) {
   cy.visit('/dashboards');
   cy.getByTestId('CreateButton').click();
-  cy.get('li[role="menuitem"]').contains('Dashboard').click();
+  cy.get('li[role="menuitem"]')
+    .contains('Dashboard')
+    .click();
   cy.getByTestId('EditDashboardDialog').within(() => {
     cy.getByTestId('DashboardSaveButton').should('be.disabled');
     cy.get('input').type(dashboardName);
@@ -27,11 +27,17 @@ function archiveDashboard(url) {
     cy.visit(url);
   }
 
-  cy.getByTestId('DashboardMoreMenu').click().within(() => {
-    cy.get('li').contains('Archive').click();
-  });
-  
-  cy.get('.btn-warning').contains('Archive').click();
+  cy.getByTestId('DashboardMoreMenu')
+    .click()
+    .within(() => {
+      cy.get('li')
+        .contains('Archive')
+        .click();
+    });
+
+  cy.get('.btn-warning')
+    .contains('Archive')
+    .click();
   cy.get('.label-tag-archived').should('exist');
 }
 
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
index 06b946228a..cc40a4649c 100644
--- a/cypress/plugins/index.js
+++ b/cypress/plugins/index.js
@@ -1 +1 @@
-module.exports = () => {};
\ No newline at end of file
+module.exports = () => {};
diff --git a/package.json b/package.json
index 2f0c4affb0..620281bae0 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "lint:base": "eslint --config ./client/.eslintrc.js",
     "test": "TZ=Africa/Khartoum jest",
     "test:watch": "jest --watch",
-    "cypress:install": "npm install --no-save cypress@^3.1.5 @percy/cypress@^0.2.3 atob@2.1.2 ",
+    "cypress:install": "npm install --no-save cypress@^3.1.5 @percy/cypress@^0.2.3 atob@2.1.2",
     "cypress": "node cypress/cypress.js"
   },
   "repository": {

From 3340082fef02f69abaa436831b70793e9874bf3b Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Tue, 12 Mar 2019 15:22:31 +0200
Subject: [PATCH 14/20] Added cleanup to afterEach

---
 cypress/integration/dashboard/dashboard_spec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cypress/integration/dashboard/dashboard_spec.js b/cypress/integration/dashboard/dashboard_spec.js
index cfd27064f5..10a6f77c14 100644
--- a/cypress/integration/dashboard/dashboard_spec.js
+++ b/cypress/integration/dashboard/dashboard_spec.js
@@ -47,6 +47,8 @@ describe('Dashboard', () => {
     archiveAllDashboards();
   });
 
+  afterEach(archiveAllDashboards);
+
   it('creates a new dashboard and archives it', () => {
     // create new
     createNewDashboard('Foo Bar');

From 4a6868d5b5b7bb9941fe45c021859e125dd89df0 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Wed, 13 Mar 2019 19:54:27 +0200
Subject: [PATCH 15/20] Removed need for clean slate

---
 client/app/pages/dashboards/DashboardList.jsx |  2 +-
 .../integration/dashboard/dashboard_spec.js   | 63 ++++++++-----------
 2 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/client/app/pages/dashboards/DashboardList.jsx b/client/app/pages/dashboards/DashboardList.jsx
index 038fde14cd..12eb17fb95 100644
--- a/client/app/pages/dashboards/DashboardList.jsx
+++ b/client/app/pages/dashboards/DashboardList.jsx
@@ -45,7 +45,7 @@ class DashboardList extends React.Component {
     Columns.favorites({ className: 'p-r-0' }),
     Columns.custom.sortable((text, item) => (
       <React.Fragment>
-        <a className="table-main-title" href={'dashboard/' + item.slug}>{ item.name }</a>
+        <a className="table-main-title" href={'dashboard/' + item.slug} data-test={item.slug}>{ item.name }</a>
         <DashboardTagsControl
           className="d-block"
           tags={item.tags}
diff --git a/cypress/integration/dashboard/dashboard_spec.js b/cypress/integration/dashboard/dashboard_spec.js
index 10a6f77c14..baa6a6c5f1 100644
--- a/cypress/integration/dashboard/dashboard_spec.js
+++ b/cypress/integration/dashboard/dashboard_spec.js
@@ -1,32 +1,25 @@
-function archiveAllDashboards() {
-  cy.visit('/dashboards');
-
-  // archive all dashboards
-  cy.getByTestId('DashboardLayoutContent').then($wrapper => {
-    $wrapper.find('.table-main-title').each((_, { href }) => {
-      archiveDashboard(href);
-    });
-  });
-}
-
 function createNewDashboard(dashboardName) {
   cy.visit('/dashboards');
   cy.getByTestId('CreateButton').click();
   cy.get('li[role="menuitem"]')
     .contains('Dashboard')
     .click();
+
+  cy.server();
+  cy.route('POST', 'api/dashboards').as('NewDashboard');
+
   cy.getByTestId('EditDashboardDialog').within(() => {
     cy.getByTestId('DashboardSaveButton').should('be.disabled');
     cy.get('input').type(dashboardName);
-    cy.getByTestId('DashboardSaveButton').click();
   });
-}
 
-function archiveDashboard(url) {
-  if (url) {
-    cy.visit(url);
-  }
+  cy.getByTestId('DashboardSaveButton').click();
+  return cy.wait('@NewDashboard').then((xhr) => {
+    return Promise.resolve(xhr.response.body.slug);
+  });
+}
 
+function archiveCurrentDashboard(url) {
   cy.getByTestId('DashboardMoreMenu')
     .click()
     .within(() => {
@@ -44,31 +37,25 @@ function archiveDashboard(url) {
 describe('Dashboard', () => {
   beforeEach(() => {
     cy.login();
-    archiveAllDashboards();
   });
 
-  afterEach(archiveAllDashboards);
-
   it('creates a new dashboard and archives it', () => {
     // create new
-    createNewDashboard('Foo Bar');
-
-    // verify listed in dashboards
-    cy.visit('/dashboards');
-    cy.getByTestId('DashboardLayoutContent').within(() => {
-      cy.get('.table-main-title')
-        .contains('Foo Bar')
-        .should('exist')
-        .click();
-    });
-
-    // archive
-    archiveDashboard();
-
-    // verify not listed in dashboards
-    cy.visit('/dashboards');
-    cy.getByTestId('DashboardLayoutContent').within(() => {
-      cy.get('.table-main-title').should('not.exist');
+    createNewDashboard('Foo Bar').then((slug) => {
+        // verify listed in dashboards
+      cy.visit('/dashboards');
+      cy.getByTestId('DashboardLayoutContent').within(() => {
+        cy.getByTestId(slug).should('exist').click();
+      });
+
+      // archive
+      archiveCurrentDashboard();
+
+      // verify not listed in dashboards
+      cy.visit('/dashboards');
+      cy.getByTestId('DashboardLayoutContent').within(() => {
+        cy.getByTestId(slug).should('not.exist');
+      });
     });
   });
 });

From be6800867910746eede5c0b1ac3e8614ffd675d5 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Wed, 13 Mar 2019 20:08:21 +0200
Subject: [PATCH 16/20] Made slug extraction safer

---
 cypress/integration/dashboard/dashboard_spec.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cypress/integration/dashboard/dashboard_spec.js b/cypress/integration/dashboard/dashboard_spec.js
index baa6a6c5f1..26bedbbb30 100644
--- a/cypress/integration/dashboard/dashboard_spec.js
+++ b/cypress/integration/dashboard/dashboard_spec.js
@@ -1,3 +1,5 @@
+import { get } from 'lodash';
+
 function createNewDashboard(dashboardName) {
   cy.visit('/dashboards');
   cy.getByTestId('CreateButton').click();
@@ -11,11 +13,13 @@ function createNewDashboard(dashboardName) {
   cy.getByTestId('EditDashboardDialog').within(() => {
     cy.getByTestId('DashboardSaveButton').should('be.disabled');
     cy.get('input').type(dashboardName);
+    cy.getByTestId('DashboardSaveButton').click();
   });
 
-  cy.getByTestId('DashboardSaveButton').click();
   return cy.wait('@NewDashboard').then((xhr) => {
-    return Promise.resolve(xhr.response.body.slug);
+    const slug = get(xhr, 'response.body.slug');
+    assert.isDefined(slug, 'Dashboard api call returns slug')
+    return Promise.resolve(slug);
   });
 }
 

From 73f32c7c88406f3ff8a50152802aecaed6ce5e03 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Wed, 13 Mar 2019 20:36:42 +0200
Subject: [PATCH 17/20] Swapped lodash import for Cypress util

---
 cypress/integration/dashboard/dashboard_spec.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cypress/integration/dashboard/dashboard_spec.js b/cypress/integration/dashboard/dashboard_spec.js
index 26bedbbb30..10bb4b0397 100644
--- a/cypress/integration/dashboard/dashboard_spec.js
+++ b/cypress/integration/dashboard/dashboard_spec.js
@@ -1,5 +1,3 @@
-import { get } from 'lodash';
-
 function createNewDashboard(dashboardName) {
   cy.visit('/dashboards');
   cy.getByTestId('CreateButton').click();
@@ -17,7 +15,7 @@ function createNewDashboard(dashboardName) {
   });
 
   return cy.wait('@NewDashboard').then((xhr) => {
-    const slug = get(xhr, 'response.body.slug');
+    const slug = Cypress._.get(xhr, 'response.body.slug');
     assert.isDefined(slug, 'Dashboard api call returns slug')
     return Promise.resolve(slug);
   });

From 3da62fe95b98a721b72ff21890c7f2fd27e2b89f Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Wed, 13 Mar 2019 20:41:43 +0200
Subject: [PATCH 18/20] Cleanup

---
 cypress/integration/dashboard/dashboard_spec.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cypress/integration/dashboard/dashboard_spec.js b/cypress/integration/dashboard/dashboard_spec.js
index 10bb4b0397..72787765ad 100644
--- a/cypress/integration/dashboard/dashboard_spec.js
+++ b/cypress/integration/dashboard/dashboard_spec.js
@@ -42,18 +42,14 @@ describe('Dashboard', () => {
   });
 
   it('creates a new dashboard and archives it', () => {
-    // create new
     createNewDashboard('Foo Bar').then((slug) => {
-        // verify listed in dashboards
       cy.visit('/dashboards');
       cy.getByTestId('DashboardLayoutContent').within(() => {
         cy.getByTestId(slug).should('exist').click();
       });
 
-      // archive
       archiveCurrentDashboard();
 
-      // verify not listed in dashboards
       cy.visit('/dashboards');
       cy.getByTestId('DashboardLayoutContent').within(() => {
         cy.getByTestId(slug).should('not.exist');

From 03c29b7e682929728a205683256404dd978b2ef1 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Wed, 13 Mar 2019 20:45:58 +0200
Subject: [PATCH 19/20] More cleanup

---
 cypress/integration/dashboard/dashboard_spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cypress/integration/dashboard/dashboard_spec.js b/cypress/integration/dashboard/dashboard_spec.js
index 72787765ad..82f7e19b89 100644
--- a/cypress/integration/dashboard/dashboard_spec.js
+++ b/cypress/integration/dashboard/dashboard_spec.js
@@ -16,12 +16,12 @@ function createNewDashboard(dashboardName) {
 
   return cy.wait('@NewDashboard').then((xhr) => {
     const slug = Cypress._.get(xhr, 'response.body.slug');
-    assert.isDefined(slug, 'Dashboard api call returns slug')
+    assert.isDefined(slug, 'Dashboard api call returns slug');
     return Promise.resolve(slug);
   });
 }
 
-function archiveCurrentDashboard(url) {
+function archiveCurrentDashboard() {
   cy.getByTestId('DashboardMoreMenu')
     .click()
     .within(() => {

From 811da5520ea2f2d481d14d2dc61572a4b4bb9e38 Mon Sep 17 00:00:00 2001
From: Ran Byron <ranbena@gmail.com>
Date: Wed, 13 Mar 2019 20:52:16 +0200
Subject: [PATCH 20/20] Cleanup #3

---
 cypress/integration/dashboard/dashboard_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/dashboard/dashboard_spec.js b/cypress/integration/dashboard/dashboard_spec.js
index 82f7e19b89..3fdafabe62 100644
--- a/cypress/integration/dashboard/dashboard_spec.js
+++ b/cypress/integration/dashboard/dashboard_spec.js
@@ -17,7 +17,7 @@ function createNewDashboard(dashboardName) {
   return cy.wait('@NewDashboard').then((xhr) => {
     const slug = Cypress._.get(xhr, 'response.body.slug');
     assert.isDefined(slug, 'Dashboard api call returns slug');
-    return Promise.resolve(slug);
+    return slug;
   });
 }