Merge remote-tracking branch 'origin/master' into production

concord-consortium · Feb 8, 2021 · 113641d · 113641d
2 parents 28c7ac5 + 2bafafb
commit 113641d
Show file tree

Hide file tree

Showing 167 changed files with 19,397 additions and 7,802 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,22 @@
 # Changelog
 
-## Version 1.5.4 - released January 12, 2020
+## Version 1.6.0 - released February 7, 2021
+
+### Features/Improvements
+- New Table design supports multiple columns
+- Graph tile supports linking multi-column tables
+- Teacher-only curriculum content (solutions)
+- Support for separate teacher guide content
+- Smaller bundle size
+
+### Asset Sizes
+
+| File | Size | % Change from Previous Release |
+|---|---|---|
+| index.css | 389,427 bytes | -22.5% |
+| index.js | 4,148,062 bytes | -16.4% |
+
+## Version 1.5.4 - released January 12, 2021
 
 ### Features/Improvements
 - Content updates (Comparing and Scaling)

diff --git a/cypress/integration/clue/branch/student_tests/canvas_test_spec.js b/cypress/integration/clue/branch/student_tests/canvas_test_spec.js
@@ -69,6 +69,7 @@ context('Test Canvas', function () {
         clueCanvas.addTile('table');
         clueCanvas.addTile('text');
         textToolTile.enterText('this is ' + studentWorkspace);
+        textToolTile.getTextTile().should('be.visible').and('contain', studentWorkspace);
       });
       it('verify copy of personal workspace', function () {
         canvas.copyDocument(copyTitle);
@@ -162,7 +163,7 @@ context('Test Canvas', function () {
         //1-up view has 4-up button visible and 1-up canvas
         clueCanvas.getFourUpViewToggle().should('be.visible');
         canvas.getSingleCanvas().should('be.visible');
-        clueCanvas.getFourUpView().should('not.be.visible');
+        clueCanvas.getFourUpView().should('not.exist');
         clueCanvas.openFourUpView();
         //4-up view is visible and 1-up button is visible
         clueCanvas.getFourToOneUpViewToggle().should('be.visible');
@@ -176,7 +177,7 @@ context('Test Canvas', function () {
         clueCanvas.openOneUpViewFromFourUp();
         canvas.getSingleCanvas().should('be.visible');
         clueCanvas.getFourUpViewToggle().should('be.visible');
-        clueCanvas.getFourUpView().should('not.be.visible');
+        clueCanvas.getFourUpView().should('not.exist');
       });
 
       it('verify share button', function () {

diff --git a/cypress/integration/clue/branch/student_tests/nav_panel_test_spec.js b/cypress/integration/clue/branch/student_tests/nav_panel_test_spec.js
@@ -95,7 +95,7 @@ describe('Test nav panel tabs', function () {
         cy.getCanvasItemTitle('learning-log').contains(this.title).should('not.exist');
         cy.getCanvasItemTitle('learning-log').should('have.length', 1);
       });
-      it('verify user starter learning log canvas exists', function () { 
+      it('verify user starter learning log canvas exists', function () {
         cy.getCanvasItemTitle('learning-log').contains("My First Learning Log").should('be.visible');
       });
       it('verify open of learning log canvas into main workspace', function () {
@@ -134,7 +134,7 @@ describe('Test nav panel tabs', function () {
         cy.openDocumentThumbnail('problem-workspaces', this.title);
       });
       it('will verify that published canvas does not have Edit button', function () {
-        cy.get('.edit-button').should("not.be.visible");
+        cy.get('.edit-button').should("not.exist");
       });
     });
   });

diff --git a/cypress/integration/clue/branch/student_tests/table_tool_spec.js b/cypress/integration/clue/branch/student_tests/table_tool_spec.js
@@ -15,7 +15,7 @@ let canvas = new Canvas,
         cy.waitForSpinner();
     });
 
-context('Table Tool Tile',function(){
+context.skip('Table Tool Tile',function(){
     describe('test menu functions of table', function(){
         it('will add a table to canvas', function(){
             clueCanvas.addTile('table');

diff --git a/cypress/integration/clue/branch/teacher_tests/teacher_dashboard_spec.js b/cypress/integration/clue/branch/teacher_tests/teacher_dashboard_spec.js
@@ -40,7 +40,7 @@ const baseUrl = `${Cypress.config("baseUrl")}`;
                     dashboard.getProblemDropdown().click({ force: true });
                     dashboard.getProblemList().should('not.have.class','show');
                     // Check class list UI and visibility
-                    dashboard.getClassList().should('not.have.class','show');
+                    dashboard.getClassList().should('not.exist');
                     dashboard.getClassDropdown().should('contain',clueData.teacherName);
                     // dashboard.getClassDropdown().should('contain',tempClass.className);
                     dashboard.getClassDropdown().should('be.visible').click({ force: true });
@@ -93,7 +93,7 @@ const baseUrl = `${Cypress.config("baseUrl")}`;
         describe('Header element functionality', () => {
             it('verify dashboard/workspace switch changes workspace view', () => {
                 dashboard.getViewToggle('Dashboard').should('be.visible').and('have.class', 'selected');
-                clueCanvas.getSingleWorkspace().should('not.be.visible');
+                clueCanvas.getSingleWorkspace().should('not.exist');
                 dashboard.getViewToggle('Workspace').should('be.visible').and('not.have.class', 'selected');
                 dashboard.getViewToggle('Workspace').click({ force: true });
                 dashboard.getViewToggle("Workspace").should('have.class', 'selected');

diff --git a/cypress/integration/clue/smoke/single_student_canvas_test.js b/cypress/integration/clue/smoke/single_student_canvas_test.js
@@ -59,7 +59,7 @@ context('single student functional test',()=>{
             //1-up view has 4-up button visible and 1-up canvas
             clueCanvas.getFourUpViewToggle().should('be.visible');
             canvas.getSingleCanvas().should('be.visible');
-            clueCanvas.getFourUpView().should('not.be.visible');
+            clueCanvas.getFourUpView().should('not.exist');
             clueCanvas.openFourUpView();
             //4-up view is visible and 1-up button is visible
             clueCanvas.getFourToOneUpViewToggle().should('be.visible');
@@ -73,7 +73,7 @@ context('single student functional test',()=>{
             clueCanvas.openOneUpViewFromFourUp();
             canvas.getSingleCanvas().should('be.visible');
             clueCanvas.getFourUpViewToggle().should('be.visible');
-            clueCanvas.getFourUpView().should('not.be.visible');
+            clueCanvas.getFourUpView().should('not.exist');
         });
 
         it('verify share button', function(){
@@ -119,11 +119,12 @@ context('single student functional test',()=>{
         });
     });
     context('save and restore of canvas', function(){
-        let canvas1='Document 1';
+        // let canvas1='Document 1';
         let canvas2='Document 2';
         before(function(){ //Open a different document to see if original document is restored
-            canvas.copyDocument(canvas1);
+            // canvas.copyDocument(canvas1);
             canvas.createNewExtraDocumentFromFileMenu(canvas2, "my-work");
+            canvas.getPersonalDocTitle().should('contain', canvas2);
             textToolTile.getTextTile().should('not.exist');
         });
         describe('verify that canvas is saved from various locations', function(){
@@ -165,7 +166,7 @@ context('single student functional test',()=>{
                 cy.get(".document-tabs.class-work .documents-panel .canvas-area").find('.geometry-content').should('exist');
                 cy.get(".document-tabs.class-work .documents-panel .canvas-area").find('.drawing-tool').should('exist');
                 cy.get(".document-tabs.class-work .documents-panel .canvas-area").find('.image-tool').should('exist');
-                cy.get(".document-tabs.class-work .documents-panel .canvas-area").find('.neo-codap-case-table').should('exist');
+                // cy.get(".document-tabs.class-work .documents-panel .canvas-area").find('.neo-codap-case-table').should('exist');
             });
         });
     });