Merge branch 'apache:master' into dm/chore/deprecate-slice-annotation…

…-json

.github/CODEOWNERS

@@ -22,4 +22,4 @@
 
 # Notify E2E test maintainers of changes
 
-/superset-frontend/cypress-base/ @jinghua-qa @geido
+/superset-frontend/cypress-base/ @jinghua-qa @geido @eschutho @rusackas @betodealmeida

docker/.env

@@ -23,7 +23,7 @@ DATABASE_PASSWORD=superset
 DATABASE_USER=superset
 
 # database engine specific environment variables
-# change the below if you prefers another database engine
+# change the below if you prefer another database engine
 DATABASE_PORT=5432
 DATABASE_DIALECT=postgresql
 POSTGRES_DB=superset

docker/.env-non-dev

@@ -23,7 +23,7 @@ DATABASE_PASSWORD=superset
 DATABASE_USER=superset
 
 # database engine specific environment variables
-# change the below if you prefers another database engine
+# change the below if you prefer another database engine
 DATABASE_PORT=5432
 DATABASE_DIALECT=postgresql
 POSTGRES_DB=superset

superset-frontend/cypress-base/cypress/integration/chart_list/list.test.ts

@@ -58,7 +58,7 @@ describe('Charts list', () => {
     cy.preserveLogin();
   });
 
-  describe('Cross-referenced dashboards', () => {
+  describe.skip('Cross-referenced dashboards', () => {
     beforeEach(() => {
       cy.createSampleDashboards([0, 1, 2, 3]);
       cy.createSampleCharts([0]);
@@ -105,6 +105,8 @@ describe('Charts list', () => {
 
   describe('list mode', () => {
     before(() => {
+      cy.createSampleDashboards([0, 1, 2, 3]);
+      cy.createSampleCharts([0]);
       visitChartList();
       setGridMode('list');
     });
@@ -114,11 +116,11 @@ describe('Charts list', () => {
       cy.getBySel('sort-header').eq(1).contains('Chart');
       cy.getBySel('sort-header').eq(2).contains('Visualization type');
       cy.getBySel('sort-header').eq(3).contains('Dataset');
-      cy.getBySel('sort-header').eq(4).contains('Dashboards added to');
-      cy.getBySel('sort-header').eq(5).contains('Modified by');
-      cy.getBySel('sort-header').eq(6).contains('Last modified');
-      cy.getBySel('sort-header').eq(7).contains('Created by');
-      cy.getBySel('sort-header').eq(8).contains('Actions');
+      // cy.getBySel('sort-header').eq(4).contains('Dashboards added to');
+      cy.getBySel('sort-header').eq(4).contains('Modified by');
+      cy.getBySel('sort-header').eq(5).contains('Last modified');
+      cy.getBySel('sort-header').eq(6).contains('Created by');
+      cy.getBySel('sort-header').eq(7).contains('Actions');
     });
 
     it('should sort correctly in list mode', () => {