summaryrefslogtreecommitdiff
path: root/tests/frontend/specs
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2013-03-14 14:22:58 -0300
committerJohn McLear <john@mclear.co.uk>2013-03-14 14:22:58 -0300
commit1462d8e80c3a20486cee95cf10c1bc3d7724c6d1 (patch)
tree32295d0fa59276b5172e14fb71b26d4298fc9bb4 /tests/frontend/specs
parent6bac01009b6706c63a63a8b6f63af99fb2f8e60e (diff)
downloadetherpad-lite-1462d8e80c3a20486cee95cf10c1bc3d7724c6d1.zip
now IE friendly
Diffstat (limited to 'tests/frontend/specs')
-rw-r--r--tests/frontend/specs/bold.js6
-rw-r--r--tests/frontend/specs/indentation.js6
-rw-r--r--tests/frontend/specs/italic.js6
-rw-r--r--tests/frontend/specs/redo.js6
-rw-r--r--tests/frontend/specs/undo.js6
5 files changed, 15 insertions, 15 deletions
diff --git a/tests/frontend/specs/bold.js b/tests/frontend/specs/bold.js
index 7c04835e..0bdbbc84 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 6e5b3c1a..81ffc78e 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 9bee72dc..be226d48 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 14ec31f6..7595da59 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 4e9dd0d5..9152c884 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);