From 1188dea8ff55a2b4320d247309399961a9841a14 Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Thu, 1 Nov 2012 23:19:59 +0000 Subject: [PATCH] increase timeouts --- tests/frontend/helper.js | 2 +- tests/frontend/specs/button_bold.js | 2 +- tests/frontend/specs/button_clear_authorship_colors.js | 2 +- tests/frontend/specs/button_indentation.js | 2 +- tests/frontend/specs/button_italic.js | 2 +- tests/frontend/specs/button_ordered_list.js | 2 +- tests/frontend/specs/button_redo.js | 2 +- tests/frontend/specs/button_strikethrough.js | 2 +- tests/frontend/specs/button_timeslider.js | 2 +- tests/frontend/specs/button_undo.js | 2 +- tests/frontend/specs/change_user_name.js | 4 ++-- tests/frontend/specs/chat_always_on_screen.js | 2 +- tests/frontend/specs/embed_value.js | 4 ++-- tests/frontend/specs/font_type.js | 2 +- tests/frontend/specs/keystroke_chat.js | 2 +- tests/frontend/specs/keystroke_delete.js | 2 +- tests/frontend/specs/keystroke_enter.js | 2 +- tests/frontend/specs/keystroke_urls_become_clickable.js | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/frontend/helper.js b/tests/frontend/helper.js index 8f79ab921..57a1b0d52 100644 --- a/tests/frontend/helper.js +++ b/tests/frontend/helper.js @@ -65,7 +65,7 @@ var helper = {}; $iframe.one('load', function(){ helper.waitFor(function(){ return !$iframe.contents().find("#editorloadingbox").is(":visible"); - }, 4000).done(function(){ + }, 50000).done(function(){ helper.padChrome$ = getFrameJQuery( $('#iframe-container iframe')); helper.padOuter$ = getFrameJQuery(helper.padChrome$('iframe.[name="ace_outer"]')); helper.padInner$ = getFrameJQuery( helper.padOuter$('iframe.[name="ace_inner"]')); diff --git a/tests/frontend/specs/button_bold.js b/tests/frontend/specs/button_bold.js index fb9d961c3..1feafe614 100644 --- a/tests/frontend/specs/button_bold.js +++ b/tests/frontend/specs/button_bold.js @@ -2,7 +2,7 @@ describe("bold button", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("makes text bold", function(done) { diff --git a/tests/frontend/specs/button_clear_authorship_colors.js b/tests/frontend/specs/button_clear_authorship_colors.js index 8949a5f75..3ab59b7d1 100644 --- a/tests/frontend/specs/button_clear_authorship_colors.js +++ b/tests/frontend/specs/button_clear_authorship_colors.js @@ -2,7 +2,7 @@ describe("clear authorship colors button", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("makes text clear authorship colors", function(done) { diff --git a/tests/frontend/specs/button_indentation.js b/tests/frontend/specs/button_indentation.js index 7fbfa1687..9c8e317e6 100644 --- a/tests/frontend/specs/button_indentation.js +++ b/tests/frontend/specs/button_indentation.js @@ -2,7 +2,7 @@ describe("indentation button", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("indent text", function(done){ diff --git a/tests/frontend/specs/button_italic.js b/tests/frontend/specs/button_italic.js index 18d4f562b..fc2e15a79 100644 --- a/tests/frontend/specs/button_italic.js +++ b/tests/frontend/specs/button_italic.js @@ -2,7 +2,7 @@ describe("italic button", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("makes text italic", function(done) { diff --git a/tests/frontend/specs/button_ordered_list.js b/tests/frontend/specs/button_ordered_list.js index 75a26ded6..3b42f90bd 100644 --- a/tests/frontend/specs/button_ordered_list.js +++ b/tests/frontend/specs/button_ordered_list.js @@ -2,7 +2,7 @@ describe("assign ordered list", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("insert ordered list text", function(done){ diff --git a/tests/frontend/specs/button_redo.js b/tests/frontend/specs/button_redo.js index 81fa42b6e..3ce69142f 100644 --- a/tests/frontend/specs/button_redo.js +++ b/tests/frontend/specs/button_redo.js @@ -1,7 +1,7 @@ describe("undo button then redo button", function(){ beforeEach(function(cb){ helper.newPad(cb); // creates a new pad - this.timeout(5000); + this.timeout(60000); }); it("undo some typing", function(done){ diff --git a/tests/frontend/specs/button_strikethrough.js b/tests/frontend/specs/button_strikethrough.js index 0c1fb43d5..9afcea0fd 100644 --- a/tests/frontend/specs/button_strikethrough.js +++ b/tests/frontend/specs/button_strikethrough.js @@ -2,7 +2,7 @@ describe("strikethrough button", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("makes text strikethrough", function(done) { diff --git a/tests/frontend/specs/button_timeslider.js b/tests/frontend/specs/button_timeslider.js index 14dd44838..1be7e170d 100644 --- a/tests/frontend/specs/button_timeslider.js +++ b/tests/frontend/specs/button_timeslider.js @@ -1,7 +1,7 @@ describe("timeslider button takes you to the timeslider of a pad", function(){ beforeEach(function(cb){ helper.newPad(cb); // creates a new pad - this.timeout(5000); + this.timeout(60000); }); it("timeslider contained in URL", function(done){ diff --git a/tests/frontend/specs/button_undo.js b/tests/frontend/specs/button_undo.js index ea6a28352..412b786be 100644 --- a/tests/frontend/specs/button_undo.js +++ b/tests/frontend/specs/button_undo.js @@ -1,7 +1,7 @@ describe("undo button", function(){ beforeEach(function(cb){ helper.newPad(cb); // creates a new pad - this.timeout(5000); + this.timeout(60000); }); it("undo some typing", function(done){ diff --git a/tests/frontend/specs/change_user_name.js b/tests/frontend/specs/change_user_name.js index 2d825f1ca..afdcf3896 100644 --- a/tests/frontend/specs/change_user_name.js +++ b/tests/frontend/specs/change_user_name.js @@ -2,7 +2,7 @@ describe("change username value", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("Changing username from one value to another sticks", function(done) { @@ -60,7 +60,7 @@ describe("change username value", function(){ it("make sure the username has stuck when we create a new pad", function(done){ beforeEach(function(cb){ // create another pad.. helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); var inner$ = helper.padInner$; diff --git a/tests/frontend/specs/chat_always_on_screen.js b/tests/frontend/specs/chat_always_on_screen.js index cf72d02d8..4873763fe 100644 --- a/tests/frontend/specs/chat_always_on_screen.js +++ b/tests/frontend/specs/chat_always_on_screen.js @@ -2,7 +2,7 @@ describe("chat always ons creen select", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("makes chat stick to right side of the screen", function(done) { diff --git a/tests/frontend/specs/embed_value.js b/tests/frontend/specs/embed_value.js index dc1511c0d..729cc6667 100644 --- a/tests/frontend/specs/embed_value.js +++ b/tests/frontend/specs/embed_value.js @@ -52,7 +52,7 @@ describe("embed links", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); describe("the share link", function(){ @@ -91,7 +91,7 @@ describe("embed links", function(){ describe("when read only option is set", function(){ beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); describe("the share link", function(){ diff --git a/tests/frontend/specs/font_type.js b/tests/frontend/specs/font_type.js index cdec47c71..af90b865b 100644 --- a/tests/frontend/specs/font_type.js +++ b/tests/frontend/specs/font_type.js @@ -2,7 +2,7 @@ describe("font select", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("makes text monospace", function(done) { diff --git a/tests/frontend/specs/keystroke_chat.js b/tests/frontend/specs/keystroke_chat.js index f882a360c..d6a7d2fd4 100644 --- a/tests/frontend/specs/keystroke_chat.js +++ b/tests/frontend/specs/keystroke_chat.js @@ -2,7 +2,7 @@ describe("send chat message", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("opens chat, sends a message and makes sure it exists on the page", function(done) { diff --git a/tests/frontend/specs/keystroke_delete.js b/tests/frontend/specs/keystroke_delete.js index f3b55b500..86e76f56f 100644 --- a/tests/frontend/specs/keystroke_delete.js +++ b/tests/frontend/specs/keystroke_delete.js @@ -2,7 +2,7 @@ describe("delete keystroke", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("makes text delete", function(done) { diff --git a/tests/frontend/specs/keystroke_enter.js b/tests/frontend/specs/keystroke_enter.js index 4d37f00ec..e46b1d2fe 100644 --- a/tests/frontend/specs/keystroke_enter.js +++ b/tests/frontend/specs/keystroke_enter.js @@ -2,7 +2,7 @@ describe("enter keystroke", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("creates a enw line & puts cursor onto a new line", function(done) { diff --git a/tests/frontend/specs/keystroke_urls_become_clickable.js b/tests/frontend/specs/keystroke_urls_become_clickable.js index 64ef3d6a8..2a46360e8 100644 --- a/tests/frontend/specs/keystroke_urls_become_clickable.js +++ b/tests/frontend/specs/keystroke_urls_become_clickable.js @@ -2,7 +2,7 @@ describe("urls", function(){ //create a new pad before each test run beforeEach(function(cb){ helper.newPad(cb); - this.timeout(5000); + this.timeout(60000); }); it("when you enter an url, it becomes clickable", function(done) {