Merge pull request #47 from concordialang/develop

Develop

Author: Matheus-JC

src/background-script/extension/ExtensionFacade.ts

@@ -89,7 +89,6 @@ export class ExtensionFacade {
 			) {
 				if (responseCallback) responseCallback(new Message([], sender.getId()));
 			}
-			console.log(message);
 			if (message.includesAction(Command.Start)){
 				if (!_this.extensionIsEnabled) {
 					chrome.tabs.query({active: true, currentWindow: true}, function(tabs) {

src/content-script/crawler/Interactor.ts

@@ -2,9 +2,7 @@ import { HTMLElementType } from '../enums/HTMLElementType';
 import { HTMLEventType } from '../enums/HTMLEventType';
 import { HTMLInputType } from '../enums/HTMLInputType';
 import { ElementInteraction } from './ElementInteraction';
-import { sleep } from '../util';
 import { InteractionResult } from './InteractionResult';
-import { ForcingExecutionStoppageErrorFromInteraction } from './ForcingExecutionStoppageErrorFromInteraction';
 
 export class Interactor {
 	constructor(private window: Window) {}

src/content-script/spec-analyser/FeatureUtil.ts

@@ -25,14 +25,14 @@ export class FeatureUtil {
 		feature.setName(featureName);
 		feature.url = url;
 
-		const scenario = this.createScenario(featureName);
+		const scenario = this.createScenario();
 		feature.addScenario(scenario);
 
 		return feature;
 	}
 
-	createScenario(featureName: string): Scenario {
-		const scenario = new Scenario(featureName + ' - ' + this.dictionary.scenarioDefaultName);
+	createScenario(): Scenario {
+		const scenario = new Scenario(this.dictionary.scenarioDefaultName);
 
 		return scenario;
 	}

src/content-script/spec-analyser/UIElementGenerator.ts

@@ -76,7 +76,9 @@ export class UIElementGenerator {
 			}
 
 			// editabled
-			uiElm.setProperty(new UIProperty(PropertyTypes.EDITABLE, true));
+			if(elm.disabled || elm.readOnly){
+				uiElm.setProperty(new UIProperty(PropertyTypes.EDITABLE, false));
+			}
 		}
 
 		// required
@@ -300,12 +302,8 @@ export class UIElementGenerator {
 		return uiElmType;
 	}
 
-	private gerateDataType(elm: HTMLElement): string {
-		let uiElmDataType = '';
-
-		if (elm.nodeName == ValidUiElementsNodes.TEXTAREA) {
-			uiElmDataType = DataTypes.STRING;
-		}
+	private gerateDataType(elm: HTMLElement): string | null{
+		let uiElmDataType: string | null = null;
 
 		if (elm.nodeName == ValidUiElementsNodes.INPUT) {
 			let inputType = (elm as HTMLInputElement).type;
@@ -316,8 +314,6 @@ export class UIElementGenerator {
 				uiElmDataType = DataTypes.TIME;
 			} else if (inputType == HTMLInputType.DateTimeLocal) {
 				uiElmDataType = DataTypes.DATETIME;
-			} else {
-				uiElmDataType = DataTypes.STRING;
 			}
 		}
 

src/content-script/spec-analyser/VariantSentencesGenerator.ts

@@ -5,6 +5,7 @@ import { VariantSentenceType } from '../enums/VariantSentenceType';
 import { getValidUiElementsNodes, isIterable, isVisible } from '../util';
 import { UIElementGenerator } from './UIElementGenerator';
 import { UiElementsTypes } from '../enums/UiElementsTypes';
+import { HTMLElementType } from '../enums/HTMLElementType';
 
 export class VariantSentencesGenerator {
 	constructor(private uiElementGenerator: UIElementGenerator) {}
@@ -117,6 +118,7 @@ export class VariantSentencesGenerator {
 						VariantSentenceType.AND,
 						VariantSentenceActions.NOTSEE,
 						[{ property: property, value: value }],
+						false
 					);
 				} else {
 					sentences = this.createSentencesForMutations(
@@ -262,7 +264,8 @@ export class VariantSentencesGenerator {
 				node,
 				VariantSentenceType.AND,
 				action,
-				[{ property: 'hidden', value: node.hidden }]
+				[{ property: 'hidden', value: node.hidden }],
+				false
 			);
 		}
 
@@ -274,10 +277,22 @@ export class VariantSentencesGenerator {
 		type: VariantSentenceType,
 		action: string,
 		attr: Array<{ property: string; value: string }> = [],
+		checkVisibility = true
 	): VariantSentence[] {
 		let sentences: VariantSentence[] = [];
 
-		let uiElement: UIElement | null = this.uiElementGenerator.createFromElement(element);
+		let uiElement: UIElement | null = null;
+
+		if(checkVisibility){
+			uiElement = 
+				!(element instanceof Text) && isVisible(element) 
+					? this.uiElementGenerator.createFromElement(element)
+					: null
+		}
+		else {
+			uiElement = this.uiElementGenerator.createFromElement(element);
+		}
+
 		if (uiElement) {
 			sentences.push(new VariantSentence(type, action, uiElement, attr));
 		} else {

src/content-script/util.ts

@@ -202,7 +202,7 @@ export function isIterable(obj): boolean {
 }
 
 export function isVisible(elm: HTMLElement) {
-	if (elm.hidden || elm.style.display === 'none' || elm.style.visibility === 'hidden') {
+	if (!elm || elm.hidden || elm.style.display === 'none' || elm.style.visibility === 'hidden') {
 		return false;
 	}
 
@@ -249,11 +249,9 @@ export function getURLasString(url: URL, config: Config): string {
 function isURLToBeConsideredFull(url: URL, config: Config): boolean {
 	for(let fullUrl of config.considerFullUrl){
 		if(url.href.includes(fullUrl.href)){
-			console.log("url:", url.href, true);
 			return true;
 		}
 	}
-	console.log("url:", url.href, false);
 	return false;
 }