TakeScreenshotOF with pageContext

aside-ufba · Jan 11, 2017 · 37a019e · 37a019e
1 parent 110151c
commit 37a019e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -237,10 +237,13 @@ Params: `<Required>` `[Optional]`
 ### takeScreenshotOf
 - Description: Take Screenshot of specific element
 - Params: `<cssSelector>`, `[crop]`, `[outline]`, `[imageWidth]`
+- Params: `Array(<cssSelector>,[cssSelector],...)`, `[crop]`, `[outline]`, `[imageWidth]`
+- Params: `Array(Array(<cssSelector>,<Iframe-CssSelector>),[cssSelector],...)`, `[crop]`, `[outline]`, `[imageWidth]`
 - Example:
   - takeScreenshotOf('#user-content-guideautomator');
   - takeScreenshotOf('#user-content-guideautomator',false,true);
-  - takeScreenshotOf(['#user-content-guideautomator','.avatar'],false,true); //Multiple cssSelector only for outline
+  - takeScreenshotOf(['#user-content-guideautomator','.avatar'],false,true); //Multiple cssSelector(only for outline)
+  - takeScreenshotOf([['#user-content-guideautomator','#frameID'],'.avatar'],false,true) //Multiple cssSelector (only for outline) on different contexts(Iframe)
 
 ### fillIn
 - Description: Fill in field element

diff --git a/bin/guide-automator-function.js b/bin/guide-automator-function.js
@@ -15,7 +15,7 @@ var __Driver = new __webdriver.Builder()
 var __DEFAULT_IMG_WIDTH = '60%';
 var __imgCount = 0;
 var __returnGuideAutomator = "";
-
+var __DefaultContext = true;
 var GLOBAL = {};
 
 var options = {
@@ -138,6 +138,7 @@ function takeScreenshot(width) {
  */
 function takeScreenshotOf(cssSelector, crop, outline, width) {
 	var cssSelectors;
+	//Multiplos elementos
 	if(cssSelector.constructor === Array) {
 		cssSelectors = cssSelector;
 		cssSelector = cssSelectors[0];
@@ -154,6 +155,15 @@ function takeScreenshotOf(cssSelector, crop, outline, width) {
 			GD.driver.executeScript("arguments[0].style.outline = '" + options.outlineStyle + "'", el);
 			if(cssSelectors) {
 				cssSelectors.forEach(element => {
+
+					//Contexto Diferentes
+					if(element.constructor === Array) {
+						pageContext(element[1].toString());
+						element = element[0];
+					} else if(!__DefaultContext)
+						pageContext();
+					//Se não foi definido um contexto e ele está em outro contexto, volte para o default
+
 					GD.driver.findElement(GD.by.css(element)).then(function(el1) {
 						GD.driver.executeScript("arguments[0].style.outline = '" + options.outlineStyle + "'", el1);
 					});
@@ -274,10 +284,13 @@ function wait(cssSelector, timeOut) {
 }
 
 function pageContext(cssSelector) {
-	if(!cssSelector || cssSelector.toString().toLowerCase() === 'default')
+	if(!cssSelector || cssSelector.toString().toLowerCase() === 'default') {
 		GD.driver.switchTo().defaultContent();
-	else
+		__DefaultContext = true;
+	} else {
 		GD.driver.switchTo().frame(GD.driver.findElement(GD.by.css(cssSelector)));
+		__DefaultContext = false;
+	}
 }
 
 function quit() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "guide-automator",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "User guide automator",
   "preferGlobal": true,
   "bin": {