update cypress to discard doc changes

This should be removed more closely. It isn't obvious why one document in the import-v2 spec is dirty and the other is not.

v3/cypress/e2e/cfm.spec.ts

@@ -60,6 +60,7 @@ context("CloudFileManager", () => {
     table.getGridCell(2, 2).should("contain", "African Elephant")
 
     // Close the document
+    // Note: because we aren't changing the document we can close it without the dialog
     cfm.closeDocument()
 
     // Verify document was closed (table doesn't exist)
@@ -74,6 +75,7 @@ context("CloudFileManager", () => {
     table.getGridCell(2, 2).should("contain", "African Elephant")
 
     // Close the document
+    // Note: because we aren't changing the document we can close it without the dialog
     cfm.closeDocument()
 
     // Verify document was closed (table doesn't exist)
@@ -87,7 +89,7 @@ context("CloudFileManager", () => {
     table.getGridCell(2, 2).should("contain", "Alabama")
 
     // Close the document
-    cfm.closeDocument()
+    cfm.closeDocument({discardChanges: true})
 
     // Verify document was closed (Map data table doesn't exist)
     c.checkComponentDoesNotExist("table")

v3/cypress/e2e/import-v2.spec.ts

@@ -11,9 +11,11 @@ context("import codap v2 documents", () => {
     cy.wait(1000)
     webView.getIFrame().find(".welcome").should("contain.text",
       "Save Madeline the dog by winning at Rock Paper Scissors.")
+    // In this case the document is not dirty for some reason
     cfm.openExampleDocument("Parachute Model")
     webView.getTitle().should("contain.text", "Terminal Velocity")
-    cfm.openExampleDocument("Getting started with CODAP")
+    // In this case the document is dirty for some reason
+    cfm.openExampleDocument("Getting started with CODAP", {discardChanges: true})
     cy.wait(1000)
     webView.getIFrame().find(".App-list").should("contain.text",
       "Drag this data file into CODAP")

v3/cypress/support/elements/cfm.ts

@@ -1,10 +1,16 @@
+interface IDocumentOptions {
+  discardChanges?: boolean
+}
 export const CfmElements = {
   openLocalDoc(filename: string) {
     cy.get('#codap-app-id').selectFile(filename, { action: 'drag-drop' })
   },
-  closeDocument() {
+  closeDocument(options?: IDocumentOptions) {
     this.getHamburgerMenuButton().click()
     this.getHamburgerMenu().contains("li", "Close").click()
+    if (options?.discardChanges) {
+      this.discardDocumentChanges()
+    }
   },
   getMenuBar() {
     return cy.get('#codap-menu-bar-id')
@@ -24,9 +30,16 @@ export const CfmElements = {
   getModalDialog() {
     return cy.get('#codap-menu-bar-id .view .modal-dialog')
   },
-  openExampleDocument(filename: string) {
+  discardDocumentChanges() {
+    this.getModalDialog().contains("Are you sure")
+    this.getModalDialog().find('button').contains("Yes").click()
+  },
+  openExampleDocument(filename: string, options?: IDocumentOptions) {
     this.getHamburgerMenuButton().click()
     this.getHamburgerMenu().find("li").contains("Open...").click()
+    if (options?.discardChanges) {
+      this.discardDocumentChanges()
+    }
     this.getModalDialog().find(".selectable").contains(filename).eq(0).click()
     this.getModalDialog().find("button").contains("Open").click()
   },