Merge branch 'main' into feature/INT-3302

tinymce · Apr 15, 2024 · 3f630a2 · 3f630a2
2 parents 6a6a95e + 7508308
commit 3f630a2
Show file tree

Hide file tree

Showing 4 changed files with 2,276 additions and 515 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,10 +1,14 @@
 #!groovy
 @Library('waluigi@release/7') _
 
-beehiveFlowBuild(
-  test: {
-    bedrockBrowsers(testDirs: [ "src/test/ts/atomic", "src/test/ts/browser" ])
-  },
+mixedBeehiveFlow(
+  testPrefix: 'Tiny-Vue',
+  testDirs: [ "src/test/ts/atomic", "src/test/ts/browser" ],
+  platforms: [
+    [ browser: 'chrome', headless: true ],
+    [ browser: 'firefox', provider: 'aws' ],
+    [ browser: 'safari', provider: 'lambdatest' ]
+  ],
   customSteps: {
     stage("update storybook") {
       def status = beehiveFlowStatus()
@@ -17,4 +21,4 @@ beehiveFlowBuild(
       }
     }
   }
-)
+)
diff --git a/package.json b/package.json
@@ -37,8 +37,8 @@
   "devDependencies": {
     "@babel/core": "^7.20.2",
     "@ephox/agar": "^7.2.1",
-    "@ephox/bedrock-client": "^13.0.0",
-    "@ephox/bedrock-server": "^13.3.0",
+    "@ephox/bedrock-client": "^14.1.1",
+    "@ephox/bedrock-server": "^14.1.2",
     "@ephox/katamari": "^9.1.1",
     "@ephox/sugar": "^9.1.1",
     "@storybook/addon-actions": "^6.5.13",

diff --git a/src/test/ts/browser/LoadTinyTest.ts b/src/test/ts/browser/LoadTinyTest.ts
@@ -32,6 +32,16 @@ UnitTest.asynctest('LoadTinyTest', (success, failure) => {
     Log.chainsAsStep('Should be able to load local version of TinyMCE using the tinymceScriptSrc prop', '', [
       cDeleteTinymce,
 
+      cRender({}, `
+        <editor
+          :init="init"
+          tinymce-script-src="/project/node_modules/tinymce-7/tinymce.min.js"
+        ></editor>
+      `),
+      cAssertTinymceVersion('7'),
+      cRemove,
+      cDeleteTinymce,
+
       cRender({}, `
         <editor
           :init="init"
@@ -67,14 +77,14 @@ UnitTest.asynctest('LoadTinyTest', (success, failure) => {
         <editor
           :init="init"
           api-key="a-fake-api-key"
-          cloud-channel="7"
+          cloud-channel="7-stable"
         ></editor>
       `),
       cAssertTinymceVersion('7'),
       Chain.op(() => {
         Assertions.assertEq(
           'TinyMCE should have been loaded from Cloud',
-          'https://cdn.tiny.cloud/1/a-fake-api-key/tinymce/7',
+          'https://cdn.tiny.cloud/1/a-fake-api-key/tinymce/7-stable',
           Global.tinymce.baseURI.source
         );
       }),
@@ -84,14 +94,15 @@ UnitTest.asynctest('LoadTinyTest', (success, failure) => {
         <editor
           :init="init"
           api-key="a-fake-api-key"
-          cloud-channel="6"
+          cloud-channel="6-stable"
         ></editor>
       `),
       cAssertTinymceVersion('6'),
       Chain.op(() => {
         Assertions.assertEq(
           'TinyMCE should have been loaded from Cloud',
-          'https://cdn.tiny.cloud/1/a-fake-api-key/tinymce/6',
+
+          'https://cdn.tiny.cloud/1/a-fake-api-key/tinymce/6-stable',
           Global.tinymce.baseURI.source
         );
       }),