From 12107859bb2325c5ba7b7bf0efeaa76682b5edb7 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 14 Mar 2013 13:41:49 -0300
Subject: [PATCH 1/6] fix tests in firefox as firefox fires on keypress not
 down

---
 tests/frontend/specs/bold.js        | 2 +-
 tests/frontend/specs/indentation.js | 2 +-
 tests/frontend/specs/italic.js      | 2 +-
 tests/frontend/specs/redo.js        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/frontend/specs/bold.js b/tests/frontend/specs/bold.js
index 2fb6bbfeb..010d69010 100644
--- a/tests/frontend/specs/bold.js
+++ b/tests/frontend/specs/bold.js
@@ -44,7 +44,7 @@ describe("bold button", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    var e = inner$.Event("keydown");
+    var e = inner$.Event("keypress");
     e.ctrlKey = true; // Control key
     e.which = 66; // b
     inner$("#innerdocbody").trigger(e);
diff --git a/tests/frontend/specs/indentation.js b/tests/frontend/specs/indentation.js
index 06d90aa86..6b9b432da 100644
--- a/tests/frontend/specs/indentation.js
+++ b/tests/frontend/specs/indentation.js
@@ -15,7 +15,7 @@ describe("indentation button", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    var e = inner$.Event("keydown");
+    var e = inner$.Event("keypress");
     e.keyCode = 9; // tab :|
     inner$("#innerdocbody").trigger(e);
 
diff --git a/tests/frontend/specs/italic.js b/tests/frontend/specs/italic.js
index 052d2df4f..15976f295 100644
--- a/tests/frontend/specs/italic.js
+++ b/tests/frontend/specs/italic.js
@@ -44,7 +44,7 @@ describe("italic some text", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    var e = inner$.Event("keydown");
+    var e = inner$.Event("keypress");
     e.ctrlKey = true; // Control key
     e.which = 105; // i
     inner$("#innerdocbody").trigger(e);
diff --git a/tests/frontend/specs/redo.js b/tests/frontend/specs/redo.js
index c14972219..d72b5a096 100644
--- a/tests/frontend/specs/redo.js
+++ b/tests/frontend/specs/redo.js
@@ -47,7 +47,7 @@ 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
 
-    var e = inner$.Event("keydown");
+    var e = inner$.Event("keypress");
     e.ctrlKey = true; // Control key
     e.which = 90; // z
     inner$("#innerdocbody").trigger(e);

From 34c2cf40faae53ef33980378ca7f5e704b91be07 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 14 Mar 2013 13:51:23 -0300
Subject: [PATCH 2/6] This isn't ideal, basically some browsers interact with
 keypress/keydown in different ways so this is a workaround but it's not perma

---
 tests/frontend/specs/bold.js        | 8 +++++++-
 tests/frontend/specs/indentation.js | 8 +++++++-
 tests/frontend/specs/italic.js      | 8 +++++++-
 tests/frontend/specs/redo.js        | 8 +++++++-
 tests/frontend/specs/undo.js        | 8 +++++++-
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/tests/frontend/specs/bold.js b/tests/frontend/specs/bold.js
index 010d69010..7c04835e2 100644
--- a/tests/frontend/specs/bold.js
+++ b/tests/frontend/specs/bold.js
@@ -44,7 +44,13 @@ describe("bold button", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    var e = inner$.Event("keypress");
+    if(!inner$.browser.chrome){
+      var evtType = "keypress";
+    }else{
+      var evtType = "keydown";
+    }
+
+    var e = inner$.Event(evtType);
     e.ctrlKey = true; // Control key
     e.which = 66; // b
     inner$("#innerdocbody").trigger(e);
diff --git a/tests/frontend/specs/indentation.js b/tests/frontend/specs/indentation.js
index 6b9b432da..6e5b3c1a0 100644
--- a/tests/frontend/specs/indentation.js
+++ b/tests/frontend/specs/indentation.js
@@ -15,7 +15,13 @@ describe("indentation button", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    var e = inner$.Event("keypress");
+    if(!inner$.browser.chrome){        
+      var evtType = "keypress";
+    }else{
+      var evtType = "keydown";
+    }
+
+    var e = inner$.Event(evtType);
     e.keyCode = 9; // tab :|
     inner$("#innerdocbody").trigger(e);
 
diff --git a/tests/frontend/specs/italic.js b/tests/frontend/specs/italic.js
index 15976f295..9bee72dcb 100644
--- a/tests/frontend/specs/italic.js
+++ b/tests/frontend/specs/italic.js
@@ -44,7 +44,13 @@ describe("italic some text", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    var e = inner$.Event("keypress");
+    if(!inner$.browser.chrome){        
+      var evtType = "keypress";
+    }else{
+      var evtType = "keydown";
+    }
+
+    var e = inner$.Event(evtType);
     e.ctrlKey = true; // Control key
     e.which = 105; // i
     inner$("#innerdocbody").trigger(e);
diff --git a/tests/frontend/specs/redo.js b/tests/frontend/specs/redo.js
index d72b5a096..059e97111 100644
--- a/tests/frontend/specs/redo.js
+++ b/tests/frontend/specs/redo.js
@@ -47,7 +47,13 @@ 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
 
-    var e = inner$.Event("keypress");
+    if(!inner$.browser.chrome){        
+      var evtType = "keypress";
+    }else{
+      var evtType = "keydown";
+    }
+
+    var e = inner$.Event(evtType);
     e.ctrlKey = true; // Control key
     e.which = 90; // z
     inner$("#innerdocbody").trigger(e);
diff --git a/tests/frontend/specs/undo.js b/tests/frontend/specs/undo.js
index 8ba752ac5..4e9dd0d57 100644
--- a/tests/frontend/specs/undo.js
+++ b/tests/frontend/specs/undo.js
@@ -44,7 +44,13 @@ describe("undo button", function(){
     var modifiedValue = $firstTextElement.text(); // get the modified value
     expect(modifiedValue).not.to.be(originalValue); // expect the value to change
 
-    var e = inner$.Event("keydown");
+    if(!inner$.browser.chrome){        
+      var evtType = "keypress";
+    }else{
+      var evtType = "keydown";
+    }
+
+    var e = inner$.Event(evtType);
     e.ctrlKey = true; // Control key
     e.which = 90; // z
     inner$("#innerdocbody").trigger(e);

From 6bac01009b6706c63a63a8b6f63af99fb2f8e60e Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 14 Mar 2013 13:52:20 -0300
Subject: [PATCH 3/6] missed an evt

---
 tests/frontend/specs/redo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/frontend/specs/redo.js b/tests/frontend/specs/redo.js
index 059e97111..14ec31f62 100644
--- a/tests/frontend/specs/redo.js
+++ b/tests/frontend/specs/redo.js
@@ -58,7 +58,7 @@ describe("undo button then redo button", function(){
     e.which = 90; // z
     inner$("#innerdocbody").trigger(e);
 
-    var e = inner$.Event("keydown");
+    var e = inner$.Event(evtType);
     e.ctrlKey = true; // Control key
     e.which = 121; // y
     inner$("#innerdocbody").trigger(e);

From 1462d8e80c3a20486cee95cf10c1bc3d7724c6d1 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 14 Mar 2013 14:22:58 -0300
Subject: [PATCH 4/6]  now IE friendly

---
 tests/frontend/specs/bold.js        | 6 +++---
 tests/frontend/specs/indentation.js | 6 +++---
 tests/frontend/specs/italic.js      | 6 +++---
 tests/frontend/specs/redo.js        | 6 +++---
 tests/frontend/specs/undo.js        | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/frontend/specs/bold.js b/tests/frontend/specs/bold.js
index 7c04835e2..0bdbbc843 100644
--- a/tests/frontend/specs/bold.js
+++ b/tests/frontend/specs/bold.js
@@ -44,10 +44,10 @@ describe("bold button", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    if(!inner$.browser.chrome){
-      var evtType = "keypress";
-    }else{
+    if(!inner$.browser.firefox){
       var evtType = "keydown";
+    }else{
+      var evtType = "keypress";
     }
 
     var e = inner$.Event(evtType);
diff --git a/tests/frontend/specs/indentation.js b/tests/frontend/specs/indentation.js
index 6e5b3c1a0..81ffc78e7 100644
--- a/tests/frontend/specs/indentation.js
+++ b/tests/frontend/specs/indentation.js
@@ -15,10 +15,10 @@ describe("indentation button", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    if(!inner$.browser.chrome){        
-      var evtType = "keypress";
-    }else{
+    if(!inner$.browser.firefox){
       var evtType = "keydown";
+    }else{
+      var evtType = "keypress";
     }
 
     var e = inner$.Event(evtType);
diff --git a/tests/frontend/specs/italic.js b/tests/frontend/specs/italic.js
index 9bee72dcb..be226d489 100644
--- a/tests/frontend/specs/italic.js
+++ b/tests/frontend/specs/italic.js
@@ -44,10 +44,10 @@ describe("italic some text", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    if(!inner$.browser.chrome){        
-      var evtType = "keypress";
-    }else{
+    if(!inner$.browser.firefox){
       var evtType = "keydown";
+    }else{
+      var evtType = "keypress";
     }
 
     var e = inner$.Event(evtType);
diff --git a/tests/frontend/specs/redo.js b/tests/frontend/specs/redo.js
index 14ec31f62..7595da599 100644
--- a/tests/frontend/specs/redo.js
+++ b/tests/frontend/specs/redo.js
@@ -47,10 +47,10 @@ 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$.browser.chrome){        
-      var evtType = "keypress";
-    }else{
+    if(!inner$.browser.firefox){        
       var evtType = "keydown";
+    }else{
+      var evtType = "keypress";
     }
 
     var e = inner$.Event(evtType);
diff --git a/tests/frontend/specs/undo.js b/tests/frontend/specs/undo.js
index 4e9dd0d57..9152c884d 100644
--- a/tests/frontend/specs/undo.js
+++ b/tests/frontend/specs/undo.js
@@ -44,10 +44,10 @@ describe("undo button", function(){
     var modifiedValue = $firstTextElement.text(); // get the modified value
     expect(modifiedValue).not.to.be(originalValue); // expect the value to change
 
-    if(!inner$.browser.chrome){        
-      var evtType = "keypress";
-    }else{
+    if(!inner$.browser.firefox){
       var evtType = "keydown";
+    }else{
+      var evtType = "keypress";
     }
 
     var e = inner$.Event(evtType);

From 24188d70076eb6368b31a41466b567e7e59186f8 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 14 Mar 2013 14:36:54 -0300
Subject: [PATCH 5/6] this should pass more tests..

---
 tests/frontend/specs/bold.js        | 7 +++----
 tests/frontend/specs/indentation.js | 6 +++---
 tests/frontend/specs/italic.js      | 6 +++---
 tests/frontend/specs/redo.js        | 6 +++---
 tests/frontend/specs/undo.js        | 4 ++--
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/tests/frontend/specs/bold.js b/tests/frontend/specs/bold.js
index 0bdbbc843..95da7331c 100644
--- a/tests/frontend/specs/bold.js
+++ b/tests/frontend/specs/bold.js
@@ -43,11 +43,10 @@ describe("bold button", function(){
 
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
-
-    if(!inner$.browser.firefox){
-      var evtType = "keydown";
-    }else{
+    if(inner$.browser.mozilla){ // if it's a mozilla browser
       var evtType = "keypress";
+    }else{
+      var evtType = "keydown";
     }
 
     var e = inner$.Event(evtType);
diff --git a/tests/frontend/specs/indentation.js b/tests/frontend/specs/indentation.js
index 81ffc78e7..9692120ae 100644
--- a/tests/frontend/specs/indentation.js
+++ b/tests/frontend/specs/indentation.js
@@ -15,10 +15,10 @@ describe("indentation button", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    if(!inner$.browser.firefox){
-      var evtType = "keydown";
-    }else{
+    if(inner$.browser.mozilla){ // if it's a mozilla browser
       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 be226d489..29dbae59c 100644
--- a/tests/frontend/specs/italic.js
+++ b/tests/frontend/specs/italic.js
@@ -44,10 +44,10 @@ describe("italic some text", function(){
     //select this text element
     $firstTextElement.sendkeys('{selectall}');
 
-    if(!inner$.browser.firefox){
-      var evtType = "keydown";
-    }else{
+    if(inner$.browser.mozilla){ // if it's a mozilla browser
       var evtType = "keypress";
+    }else{
+      var evtType = "keydown";
     }
 
     var e = inner$.Event(evtType);
diff --git a/tests/frontend/specs/redo.js b/tests/frontend/specs/redo.js
index 7595da599..c2f8a95a6 100644
--- a/tests/frontend/specs/redo.js
+++ b/tests/frontend/specs/redo.js
@@ -47,10 +47,10 @@ 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$.browser.firefox){        
-      var evtType = "keydown";
-    }else{
+    if(inner$.browser.mozilla){ // if it's a mozilla browser
       var evtType = "keypress";
+    }else{
+      var evtType = "keydown";
     }
 
     var e = inner$.Event(evtType);
diff --git a/tests/frontend/specs/undo.js b/tests/frontend/specs/undo.js
index 9152c884d..6fed22e38 100644
--- a/tests/frontend/specs/undo.js
+++ b/tests/frontend/specs/undo.js
@@ -45,9 +45,9 @@ describe("undo button", function(){
     expect(modifiedValue).not.to.be(originalValue); // expect the value to change
 
     if(!inner$.browser.firefox){
-      var evtType = "keydown";
-    }else{
       var evtType = "keypress";
+    }else{
+      var evtType = "keydown";
     }
 
     var e = inner$.Event(evtType);

From 29c0d790b51f187d6ce74fe8603013544a9217df Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Thu, 14 Mar 2013 14:48:23 -0300
Subject: [PATCH 6/6] fix undo test

---
 tests/frontend/specs/undo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/frontend/specs/undo.js b/tests/frontend/specs/undo.js
index 6fed22e38..0c58c9b84 100644
--- a/tests/frontend/specs/undo.js
+++ b/tests/frontend/specs/undo.js
@@ -44,7 +44,7 @@ describe("undo button", function(){
     var modifiedValue = $firstTextElement.text(); // get the modified value
     expect(modifiedValue).not.to.be(originalValue); // expect the value to change
 
-    if(!inner$.browser.firefox){
+    if(inner$.browser.mozilla){ // if it's a mozilla browser
       var evtType = "keypress";
     }else{
       var evtType = "keydown";