From 3460159f68d91aa2a9c739f82e9b79f5e07caf7e Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 1 Mar 2013 14:04:33 +0000 Subject: [PATCH 1/4] fix a test --- tests/frontend/specs/embed_value.js | 9 ++++++--- tests/frontend/specs/font_type.js | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/frontend/specs/embed_value.js b/tests/frontend/specs/embed_value.js index 729cc6667..029f0dd5d 100644 --- a/tests/frontend/specs/embed_value.js +++ b/tests/frontend/specs/embed_value.js @@ -100,8 +100,8 @@ describe("embed links", function(){ //open share dropdown chrome$(".buttonicon-embed").click(); - //check read only checkbox, a bit hacky - chrome$('#readonlyinput').attr('checked','checked').click().attr('checked','checked'); + chrome$('#readonlyinput').click(); + chrome$('#readonlyinput:checkbox:not(:checked)').attr('checked', 'checked'); //get the link of the share field + the actual pad url and compare them var shareLink = chrome$("#linkinput").val(); @@ -119,7 +119,9 @@ describe("embed links", function(){ //open share dropdown chrome$(".buttonicon-embed").click(); //check read only checkbox, a bit hacky - chrome$('#readonlyinput').attr('checked','checked').click().attr('checked','checked'); + chrome$('#readonlyinput').click(); + chrome$('#readonlyinput:checkbox:not(:checked)').attr('checked', 'checked'); + //get the link of the share field + the actual pad url and compare them var embedCode = chrome$("#embedinput").val(); @@ -129,5 +131,6 @@ describe("embed links", function(){ done(); }); }); + }); }); diff --git a/tests/frontend/specs/font_type.js b/tests/frontend/specs/font_type.js index af90b865b..8ef489aa8 100644 --- a/tests/frontend/specs/font_type.js +++ b/tests/frontend/specs/font_type.js @@ -17,9 +17,11 @@ describe("font select", function(){ var $viewfontmenu = chrome$("#viewfontmenu"); var $monospaceoption = $viewfontmenu.find("[value=monospace]"); +console.log($monospaceoption); + //select monospace and fire change event $monospaceoption.attr('selected','selected'); - $viewfontmenu.change(); + // $viewfontmenu.change(); //check if font changed to monospace var fontFamily = inner$("body").css("font-family").toLowerCase(); From cadb671ae15484d6327106058309e328bd14d5b3 Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 1 Mar 2013 23:29:12 +0000 Subject: [PATCH 2/4] this approach seems to work better for change in latest jQ --- tests/frontend/specs/language.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/frontend/specs/language.js b/tests/frontend/specs/language.js index e7705914e..86d2d7406 100644 --- a/tests/frontend/specs/language.js +++ b/tests/frontend/specs/language.js @@ -56,10 +56,8 @@ describe("Language select and change", function(){ //click the language button var $language = chrome$("#languagemenu"); - var $languageoption = $language.find("[value=en]"); - - //select german - $languageoption.attr('selected','selected'); + //select english + $language.val("en"); $language.change(); //get the value of the bold button From 4e205fe0af0669588b0b6779def303c4a62b1155 Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 1 Mar 2013 23:33:24 +0000 Subject: [PATCH 3/4] fix monospace text --- tests/frontend/specs/font_type.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/frontend/specs/font_type.js b/tests/frontend/specs/font_type.js index 8ef489aa8..af90b865b 100644 --- a/tests/frontend/specs/font_type.js +++ b/tests/frontend/specs/font_type.js @@ -17,11 +17,9 @@ describe("font select", function(){ var $viewfontmenu = chrome$("#viewfontmenu"); var $monospaceoption = $viewfontmenu.find("[value=monospace]"); -console.log($monospaceoption); - //select monospace and fire change event $monospaceoption.attr('selected','selected'); - // $viewfontmenu.change(); + $viewfontmenu.change(); //check if font changed to monospace var fontFamily = inner$("body").css("font-family").toLowerCase(); From d8154deee3ba61d34fac105f96be41fa2131d8a3 Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 1 Mar 2013 23:40:25 +0000 Subject: [PATCH 4/4] more fixes --- tests/frontend/specs/font_type.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/frontend/specs/font_type.js b/tests/frontend/specs/font_type.js index af90b865b..25d9df052 100644 --- a/tests/frontend/specs/font_type.js +++ b/tests/frontend/specs/font_type.js @@ -19,6 +19,7 @@ describe("font select", function(){ //select monospace and fire change event $monospaceoption.attr('selected','selected'); + $viewfontmenu.val("monospace"); $viewfontmenu.change(); //check if font changed to monospace