Merge branch 't/13265'

ckeditor · Aug 11, 2015 · b3a0c8c · b3a0c8c
2 parents b7de5bb + 886aed9
commit b3a0c8c
Show file tree

Hide file tree

Showing 6 changed files with 156 additions and 14 deletions.
diff --git a/bender.js b/bender.js
@@ -15,6 +15,12 @@ var config = {
 
 	framework: 'yui',
 
+	/*secure: true,*/
+
+	privateKey: 'tests/ssl/key.pem',
+
+	certificate: 'tests/ssl/cert.pem',
+
 	plugins: [
 		'benderjs-yui',
 		'benderjs-sinon',

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
 	"description": "The development version of CKEditor - JavaScript WYSIWYG web text editor.",
 	"devDependencies": {
 		"benderjs-coverage": "~0.2.0",
-		"benderjs": "~0.2.4",
+		"benderjs": "~0.3.0",
 		"benderjs-jquery": "~0.3.0",
 		"benderjs-sinon": "~0.2.1",
 		"benderjs-yui": "~0.2.4",

diff --git a/tests/core/dom/_assets/yui-3.17.1-dom-screen-node-core.debug.js b/tests/core/dom/_assets/yui-3.17.1-dom-screen-node-core.debug.js
@@ -165,7 +165,7 @@ available.
     var proto, prop,
         VERSION = '3.17.1',
         PERIOD = '.',
-        BASE = 'http://yui.yahooapis.com/',
+        BASE = 'https://yui.yahooapis.com/',
         /*
             These CSS class names can't be generated by
             getClassName since it is not available at the
@@ -206,7 +206,7 @@ available.
             YUI.Env.DOMReady = true;
             if (hasWin) {
                 remove(doc, 'DOMContentLoaded', handleReady);
-            }        
+            }
         },
         handleLoad = function() {
             YUI.Env.windowLoaded = true;
@@ -2493,14 +2493,14 @@ L.now = Date.now || function () {
 };
 
 /**
- * Performs `{placeholder}` substitution on a string. The object passed as the 
+ * Performs `{placeholder}` substitution on a string. The object passed as the
  * second parameter provides values to replace the `{placeholder}`s.
  * `{placeholder}` token names must match property names of the object. For example,
- * 
+ *
  *`var greeting = Y.Lang.sub("Hello, {who}!", { who: "World" });`
  *
- * `{placeholder}` tokens that are undefined on the object map will be left 
- * in tact (leaving unsightly `{placeholder}`'s in the output string). 
+ * `{placeholder}` tokens that are undefined on the object map will be left
+ * in tact (leaving unsightly `{placeholder}`'s in the output string).
  *
  * @method sub
  * @param {string} s String to be modified.
@@ -5741,7 +5741,7 @@ add('load', '8', {
         useSVG = !Y.config.defaultGraphicEngine || Y.config.defaultGraphicEngine != "canvas",
 		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
         svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    
+
     return svg && (useSVG || !canvas);
 },
     "trigger": "graphics"
@@ -5754,7 +5754,7 @@ add('load', '9', {
         useSVG = !Y.config.defaultGraphicEngine || Y.config.defaultGraphicEngine != "canvas",
 		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
         svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    
+
     return svg && (useSVG || !canvas);
 },
     "trigger": "graphics"
@@ -5807,7 +5807,7 @@ add('load', '14', {
     function workingNative( k, v ) {
         return k === "ok" ? true : v;
     }
-    
+
     // Double check basic functionality.  This is mainly to catch early broken
     // implementations of the JSON API in Firefox 3.1 beta1 and beta2
     if ( nativeSupport ) {
@@ -6885,7 +6885,7 @@ add('load', '8', {
         useSVG = !Y.config.defaultGraphicEngine || Y.config.defaultGraphicEngine != "canvas",
 		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
         svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    
+
     return svg && (useSVG || !canvas);
 },
     "trigger": "graphics"
@@ -6898,7 +6898,7 @@ add('load', '9', {
         useSVG = !Y.config.defaultGraphicEngine || Y.config.defaultGraphicEngine != "canvas",
 		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
         svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    
+
     return svg && (useSVG || !canvas);
 },
     "trigger": "graphics"
@@ -6951,7 +6951,7 @@ add('load', '14', {
     function workingNative( k, v ) {
         return k === "ok" ? true : v;
     }
-    
+
     // Double check basic functionality.  This is mainly to catch early broken
     // implementations of the JSON API in Firefox 3.1 beta1 and beta2
     if ( nativeSupport ) {
@@ -9332,7 +9332,7 @@ var Selector = {
     /**
      * Determines whether or not the given node matches the given CSS selector.
      * @method test
-     * 
+     *
      * @param {HTMLElement} node A node to test.
      * @param {String} selector A CSS selector to test the node against.
      * @param {HTMLElement} root optional A node to start the query from. Defaults to the parent document of the node.