yarn build and adapt e2e tests

Co-Authored-By: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
mermaid-js · Aug 18, 2021 · 55faa3c · 55faa3c
1 parent 8af36b7
commit 55faa3c
Show file tree

Hide file tree

Showing 28 changed files with 82,308 additions and 21,846 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,20 +14,14 @@ jobs:
     - name: Setup Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v2
       with:
+        cache: yarn
         node-version: ${{ matrix.node-version }}
 
     - name: Install Yarn
       run: npm i yarn --global
 
-    - name: Cache Node Modules
-      uses: actions/cache@v2
-      with:
-        path: .cache
-        key: ${{ runner.OS }}-build-${{ hashFiles('**/yarn.lock') }}
-
     - name: Install Packages
       run: |
-        yarn config set cache-folder $GITHUB_WORKSPACE/.cache/yarn
         yarn install --frozen-lockfile
       env:
         CYPRESS_CACHE_FOLDER: .cache/Cypress

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -14,20 +14,14 @@ jobs:
     - name: Setup Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v2
       with:
+        cache: yarn
         node-version: ${{ matrix.node-version }}
 
     - name: Install Yarn
       run: npm i yarn --global
 
-    - name: Cache Node Modules
-      uses: actions/cache@v2
-      with:
-        path: .cache
-        key: ${{ runner.OS }}-build-${{ hashFiles('**/yarn.lock') }}
-
     - name: Install Packages
       run: |
-        yarn config set cache-folder $GITHUB_WORKSPACE/.cache/yarn
         yarn install --frozen-lockfile
       env:
         CYPRESS_CACHE_FOLDER: .cache/Cypress

diff --git a/cypress/integration/rendering/flowchart-v2.spec.js b/cypress/integration/rendering/flowchart-v2.spec.js
@@ -101,7 +101,7 @@ describe('Flowchart v2', () => {
         const style = svg.attr('style');
         expect(style).to.match(/^max-width: [\d.]+px;$/);
         const maxWidthValue = parseFloat(style.match(/[\d.]+/g).join(''));
-        expect(maxWidthValue).to.be.within(300 * .95-1, 300 * 1.05);
+        expect(maxWidthValue).to.be.within(290 * .95-1, 290 * 1.05);
       });
   });
   it('8: should render a flowchart when useMaxWidth is false', () => {
@@ -121,7 +121,7 @@ describe('Flowchart v2', () => {
         const width = parseFloat(svg.attr('width'));
         // use within because the absolute value can be slightly different depending on the environment ±5%
         expect(height).to.be.within(446 * .95, 446 * 1.05);
-        expect(width).to.be.within(300 * .95-1, 300 * 1.05);
+        expect(width).to.be.within(290 * .95-1, 290 * 1.05);
         expect(svg).to.not.have.attr('style');
       });
   });

diff --git a/cypress/integration/rendering/sequencediagram.spec.js b/cypress/integration/rendering/sequencediagram.spec.js
@@ -584,7 +584,7 @@ context('Sequence diagram', () => {
           expect(svg).to.have.attr('width', '100%');
           expect(svg).to.have.attr('height');
           const height = parseFloat(svg.attr('height'));
-          expect(height).to.eq(920);
+          expect(height).to.be.within(920, 960);
           const style = svg.attr('style');
           expect(style).to.match(/^max-width: [\d.]+px;$/);
           const maxWidthValue = parseFloat(style.match(/[\d.]+/g).join(''));
@@ -624,7 +624,7 @@ context('Sequence diagram', () => {
         .should((svg) => {
           const height = parseFloat(svg.attr('height'));
           const width = parseFloat(svg.attr('width'));
-          expect(height).to.eq(920);
+          expect(height).to.be.within(920, 960);
           // use within because the absolute value can be slightly different depending on the environment ±5%
           expect(width).to.be.within(820 * .95, 820 * 1.05);
           expect(svg).to.not.have.attr('style');

diff --git a/cypress/integration/rendering/stateDiagram-v2.spec.js b/cypress/integration/rendering/stateDiagram-v2.spec.js
@@ -452,7 +452,7 @@ stateDiagram-v2
         expect(svg).to.have.attr('width', '100%');
         expect(svg).to.have.attr('height');
         const height = parseFloat(svg.attr('height'));
-        expect(height).to.eq(177);
+        expect(height).to.be.within(177, 178);
         const style = svg.attr('style');
         expect(style).to.match(/^max-width: [\d.]+px;$/);
         const maxWidthValue = parseFloat(style.match(/[\d.]+/g).join(''));
@@ -474,7 +474,7 @@ stateDiagram-v2
       .should((svg) => {
         const height = parseFloat(svg.attr('height'));
         const width = parseFloat(svg.attr('width'));
-        expect(height).to.eq(177);
+        expect(height).to.be.within(177, 178);
         // use within because the absolute value can be slightly different depending on the environment ±5%
         expect(width).to.be.within(135 * .95, 135 * 1.05);
         expect(svg).to.not.have.attr('style');

diff --git a/...sspelling -- should handle a click on a node with a bound function (failed).png b/...sspelling -- should handle a click on a node with a bound function (failed).png
diff --git a/...n a node with a bound function where the node starts with a number (failed).png b/...n a node with a bound function where the node starts with a number (failed).png
diff --git a/...lling -- should handle a click on a task with a bound function (failed) (1).png b/...lling -- should handle a click on a task with a bound function (failed) (1).png
diff --git a/...sspelling -- should handle a click on a task with a bound function (failed).png b/...sspelling -- should handle a click on a task with a bound function (failed).png
diff --git a/...n a node with a bound function where the node starts with a number (failed).png b/...n a node with a bound function where the node starts with a number (failed).png
diff --git a/... tight -- should handle a click on a node without a bound function (failed).png b/... tight -- should handle a click on a node without a bound function (failed).png
diff --git a/...tight -- should handle a click on a task with a bound function (failed) (1).png b/...tight -- should handle a click on a task with a bound function (failed) (1).png
diff --git a/...vel tight -- should handle a click on a task with a bound function (failed).png b/...vel tight -- should handle a click on a task with a bound function (failed).png
diff --git a/...e.spec.js/Sequencediagram -- should handle html escapings properly (failed).png b/...e.spec.js/Sequencediagram -- should handle html escapings properly (failed).png
diff --git a/...7 should render a class diagram when useMaxWidth is true (default) (failed).png b/...7 should render a class diagram when useMaxWidth is true (default) (failed).png
diff --git a/...gram -- 18 should render a class diagram when useMaxWidth is false (failed).png b/...gram -- 18 should render a class diagram when useMaxWidth is false (failed).png
diff --git a/...size -- should render a sequence diagram when useMaxWidth is false (failed).png b/...size -- should render a sequence diagram when useMaxWidth is false (failed).png
diff --git a/...hould render a sequence diagram when useMaxWidth is true (default) (failed).png b/...hould render a sequence diagram when useMaxWidth is true (default) (failed).png
diff --git a/...gram -- v2 should render a state diagram when useMaxWidth is false (failed).png b/...gram -- v2 should render a state diagram when useMaxWidth is false (failed).png
diff --git a/...2 should render a state diagram when useMaxWidth is true (default) (failed).png b/...2 should render a state diagram when useMaxWidth is true (default) (failed).png
diff --git a/dist/mermaid.core.js b/dist/mermaid.core.js
@@ -3283,10 +3283,8 @@ var rectWithTitle = function rectWithTitle(parent, node) {
 
 
   var halfPadding = node.padding / 2;
-  Object(d3__WEBPACK_IMPORTED_MODULE_0__["select"])(descr).attr('transform', 'translate( ' + ( // (titleBox.width - bbox.width) / 2 +
-  bbox.width > titleBox.width ? 0 : (titleBox.width - bbox.width) / 2) + ', ' + (titleBox.height + halfPadding + 5) + ')');
-  Object(d3__WEBPACK_IMPORTED_MODULE_0__["select"])(text).attr('transform', 'translate( ' + ( // (titleBox.width - bbox.width) / 2 +
-  bbox.width < titleBox.width ? 0 : -(titleBox.width - bbox.width) / 2) + ', ' + 0 + ')'); // Get the size of the label
+  Object(d3__WEBPACK_IMPORTED_MODULE_0__["select"])(descr).attr('transform', 'translate( ' + (bbox.width > titleBox.width ? 0 : (titleBox.width - bbox.width) / 2) + ', ' + (titleBox.height + halfPadding + 5) + ')');
+  Object(d3__WEBPACK_IMPORTED_MODULE_0__["select"])(text).attr('transform', 'translate( ' + (bbox.width < titleBox.width ? 0 : -(titleBox.width - bbox.width) / 2) + ', ' + 0 + ')'); // Get the size of the label
   // Bounding box for title and text
 
   bbox = label.node().getBBox(); // Center the label
@@ -3989,7 +3987,7 @@ var config = {
    * call to mermaidAPI.initialize. Calls to mermaidAPI.reinitialize cannot make changes to
    * the `secure` keys in the current currentConfig. This prevents malicious graph directives from
    * overriding a site's default security.
-    * **Notes**:
+     * **Notes**:
    *
    * Default value: ['secure', 'securityLevel', 'startOnLoad', 'maxTextSize']
    */

diff --git a/dist/mermaid.core.js.map b/dist/mermaid.core.js.map