diff --git a/tests/frontend/specs/bold.js b/tests/frontend/specs/bold.js index f48b31ef1..2d77d1680 100644 --- a/tests/frontend/specs/bold.js +++ b/tests/frontend/specs/bold.js @@ -47,7 +47,12 @@ describe("bold button", function(){ if(inner$(window)[0].bowser.modernIE){ // if it's IE var evtType = "keypress"; }else{ - var evtType = "keydown"; + // Edge also requires keypress. + if(window.navigator.userAgent.indexOf("Edge") > -1){ + var evtType = "keypress"; + }else{ + var evtType = "keydown"; + } } var e = inner$.Event(evtType); diff --git a/tests/frontend/specs/caret.js b/tests/frontend/specs/caret.js index 59180c8f6..e35ad0e9a 100644 --- a/tests/frontend/specs/caret.js +++ b/tests/frontend/specs/caret.js @@ -297,11 +297,18 @@ function prepareDocument(n, target){ // generates a random document with random } function keyEvent(target, charCode, ctrl, shift){ // sends a charCode to the window - if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE){ // if it's a mozilla or IE + if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE){ // if it's IE var evtType = "keypress"; }else{ - var evtType = "keydown"; + // Edge also requires keypress. + if(window.navigator.userAgent.indexOf("Edge") > -1){ + var evtType = "keypress"; + }else{ + var evtType = "keydown"; + } } + + var e = target.Event(evtType); console.log(e); if(ctrl){ diff --git a/tests/frontend/specs/indentation.js b/tests/frontend/specs/indentation.js index dd12fc317..1b9732ef3 100644 --- a/tests/frontend/specs/indentation.js +++ b/tests/frontend/specs/indentation.js @@ -18,7 +18,12 @@ describe("indentation button", function(){ if(inner$(window)[0].bowser.modernIE){ // if it's IE var evtType = "keypress"; }else{ - var evtType = "keydown"; + // Edge also requires keypress. + if(window.navigator.userAgent.indexOf("Edge") > -1){ + var evtType = "keypress"; + }else{ + var evtType = "keydown"; + } } var e = inner$.Event(evtType); diff --git a/tests/frontend/specs/italic.js b/tests/frontend/specs/italic.js index 177031bec..b56887ea9 100644 --- a/tests/frontend/specs/italic.js +++ b/tests/frontend/specs/italic.js @@ -47,7 +47,12 @@ describe("italic some text", function(){ if(inner$(window)[0].bowser.modernIE){ // if it's IE var evtType = "keypress"; }else{ - var evtType = "keydown"; + // Edge also requires keypress. + if(window.navigator.userAgent.indexOf("Edge") > -1){ + var evtType = "keypress"; + }else{ + var evtType = "keydown"; + } } var e = inner$.Event(evtType); diff --git a/tests/frontend/specs/ordered_list.js b/tests/frontend/specs/ordered_list.js index e7509e883..ec9694904 100644 --- a/tests/frontend/specs/ordered_list.js +++ b/tests/frontend/specs/ordered_list.js @@ -111,10 +111,15 @@ describe("assign ordered list", function(){ var triggerCtrlShiftShortcut = function(shortcutChar) { var inner$ = helper.padInner$; - if(inner$(window)[0].bowser.modernIE) { // if it's IE + if(inner$(window)[0].bowser.modernIE){ // if it's IE var evtType = "keypress"; }else{ - var evtType = "keydown"; + // Edge also requires keypress. + if(window.navigator.userAgent.indexOf("Edge") > -1){ + var evtType = "keypress"; + }else{ + var evtType = "keydown"; + } } var e = inner$.Event(evtType); e.ctrlKey = true; diff --git a/tests/frontend/specs/redo.js b/tests/frontend/specs/redo.js index d99f35ee9..63406c3b6 100644 --- a/tests/frontend/specs/redo.js +++ b/tests/frontend/specs/redo.js @@ -47,10 +47,15 @@ describe("undo button then redo button", function(){ var modifiedValue = $firstTextElement.text(); // get the modified value expect(modifiedValue).not.to.be(originalValue); // expect the value to change - if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE){ // if it's a mozilla or IE + if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE){ // if it's IE var evtType = "keypress"; }else{ - var evtType = "keydown"; + // Edge also requires keypress. + if(window.navigator.userAgent.indexOf("Edge") > -1){ + var evtType = "keypress"; + }else{ + var evtType = "keydown"; + } } var e = inner$.Event(evtType); diff --git a/tests/frontend/specs/scroll.js b/tests/frontend/specs/scroll.js index 94756b856..2c46cdfba 100644 --- a/tests/frontend/specs/scroll.js +++ b/tests/frontend/specs/scroll.js @@ -513,11 +513,18 @@ describe('scroll when focus line is out of viewport', function () { var pressKey = function(keyCode, shiftIsPressed){ var inner$ = helper.padInner$; var evtType; + if(inner$(window)[0].bowser.modernIE){ // if it's IE - evtType = 'keypress'; + var evtType = "keypress"; }else{ - evtType = 'keydown'; + // Edge also requires keypress. + if(window.navigator.userAgent.indexOf("Edge") > -1){ + var evtType = "keypress"; + }else{ + var evtType = "keydown"; + } } + var e = inner$.Event(evtType); e.shiftKey = shiftIsPressed; e.keyCode = keyCode; diff --git a/tests/frontend/specs/select_formatting_buttons.js b/tests/frontend/specs/select_formatting_buttons.js index b6ec6d0c3..15b17da04 100644 --- a/tests/frontend/specs/select_formatting_buttons.js +++ b/tests/frontend/specs/select_formatting_buttons.js @@ -91,7 +91,12 @@ describe("select formatting buttons when selection has style applied", function( if(inner$(window)[0].bowser.modernIE){ // if it's IE var evtType = "keypress"; }else{ - var evtType = "keydown"; + // Edge also requires keypress. + if(window.navigator.userAgent.indexOf("Edge") > -1){ + var evtType = "keypress"; + }else{ + var evtType = "keydown"; + } } var e = inner$.Event(evtType);