Merge Firefox frontend test fixes

The fix was done on another branch to show that it completely solves tests
failures introduced by 2be873e3c7.

All remaining failures in this branch are due to other changes made after
**1.6.6**, namely from fe08d2a1db included onwards.
This commit is contained in:
muxator 2018-07-21 14:16:20 +02:00
commit 42e0646327
7 changed files with 12 additions and 12 deletions

View File

@ -44,7 +44,7 @@ describe("bold button", function(){
//select this text element //select this text element
$firstTextElement.sendkeys('{selectall}'); $firstTextElement.sendkeys('{selectall}');
if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE){ // if it's a mozilla or IE if(inner$(window)[0].bowser.modernIE){ // if it's IE
var evtType = "keypress"; var evtType = "keypress";
}else{ }else{
var evtType = "keydown"; var evtType = "keydown";

View File

@ -15,7 +15,7 @@ describe("indentation button", function(){
//select this text element //select this text element
$firstTextElement.sendkeys('{selectall}'); $firstTextElement.sendkeys('{selectall}');
if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE){ // if it's a mozilla or IE if(inner$(window)[0].bowser.modernIE){ // if it's IE
var evtType = "keypress"; var evtType = "keypress";
}else{ }else{
var evtType = "keydown"; var evtType = "keydown";
@ -325,7 +325,7 @@ describe("indentation button", function(){
function pressEnter(){ function pressEnter(){
var inner$ = helper.padInner$; var inner$ = helper.padInner$;
if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE){ // if it's a mozilla or IE if(inner$(window)[0].bowser.modernIE){ // if it's IE
var evtType = "keypress"; var evtType = "keypress";
}else{ }else{
var evtType = "keydown"; var evtType = "keydown";

View File

@ -44,7 +44,7 @@ describe("italic some text", function(){
//select this text element //select this text element
$firstTextElement.sendkeys('{selectall}'); $firstTextElement.sendkeys('{selectall}');
if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE){ // if it's a mozilla or IE if(inner$(window)[0].bowser.modernIE){ // if it's IE
var evtType = "keypress"; var evtType = "keypress";
}else{ }else{
var evtType = "keydown"; var evtType = "keydown";

View File

@ -111,7 +111,7 @@ describe("assign ordered list", function(){
var triggerCtrlShiftShortcut = function(shortcutChar) { var triggerCtrlShiftShortcut = function(shortcutChar) {
var inner$ = helper.padInner$; var inner$ = helper.padInner$;
if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE) { // if it's a mozilla or IE if(inner$(window)[0].bowser.modernIE) { // if it's IE
var evtType = "keypress"; var evtType = "keypress";
}else{ }else{
var evtType = "keydown"; var evtType = "keydown";

View File

@ -513,7 +513,7 @@ describe('scroll when focus line is out of viewport', function () {
var pressKey = function(keyCode, shiftIsPressed){ var pressKey = function(keyCode, shiftIsPressed){
var inner$ = helper.padInner$; var inner$ = helper.padInner$;
var evtType; var evtType;
if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE){ // if it's a mozilla or IE if(inner$(window)[0].bowser.modernIE){ // if it's IE
evtType = 'keypress'; evtType = 'keypress';
}else{ }else{
evtType = 'keydown'; evtType = 'keydown';

View File

@ -88,7 +88,7 @@ describe("select formatting buttons when selection has style applied", function(
//select this text element //select this text element
$firstTextElement.sendkeys('{selectall}'); $firstTextElement.sendkeys('{selectall}');
if(inner$(window)[0].bowser.firefox || inner$(window)[0].bowser.modernIE){ // if it's a mozilla or IE if(inner$(window)[0].bowser.modernIE){ // if it's IE
var evtType = "keypress"; var evtType = "keypress";
}else{ }else{
var evtType = "keydown"; var evtType = "keydown";

View File

@ -44,11 +44,11 @@ describe("undo button", function(){
var modifiedValue = $firstTextElement.text(); // get the modified value var modifiedValue = $firstTextElement.text(); // get the modified value
expect(modifiedValue).not.to.be(originalValue); // expect the value to change expect(modifiedValue).not.to.be(originalValue); // expect the value to change
if(inner$(window)[0].bowser.firefox){ // if it's a mozilla browser /*
var evtType = "keypress"; * ACHTUNG: this is the only place in the test codebase in which a keydown
}else{ * is sent for IE. Everywhere else IE uses keypress.
var evtType = "keydown"; */
} var evtType = "keydown";
var e = inner$.Event(evtType); var e = inner$.Event(evtType);
e.ctrlKey = true; // Control key e.ctrlKey = true; // Control key