Merge branch '1.0.x' of github.com:webship/webship-js into 1.0.x

Author: Natshah

tests/features/test--when--i-select-option-from-dropdownlist-by-attr.feature

@@ -1,10 +1,22 @@
-Feature: An example of selecting an option in the dropdown list by its text label.
+Feature: An example of selecting an option from a dropdown list using its attributes.
 
   As a tester,
-  I want to be able to test selecting an option from a dropdown list by its text label.
+  I want to be able to test selecting an option from a dropdown list using its attributes.
+
+  Scenario: Check selecting an option from a dropdown list using its attributes.
+    Given I am on "/test--when--i-select-option-from-dropdownlist.html"
+     When I select "Saab" from "#cars"
+     When I press "Submit"
+     Then I should see "Option ( Saab ) has been selected successfully"
+
+  Scenario: Check selecting an option from a dropdown list.
+    Given I am on "/test--when--i-select-option-from-dropdownlist.html"
+     When I select "mercedes" from "cars"
+     When I press "Submit"
+     Then I should see "Option ( Mercedes ) has been selected successfully"
 
   Scenario: Check selecting an option from a dropdown list by its text label.
     Given I am on "/test--when--i-select-option-from-dropdownlist.html"
      When I select "Saab" from "Choose a car:"
-     When I press "Submit" by attr
+     When I press "Submit"
      Then I should see "Option ( Saab ) has been selected successfully"

tests/features/test--when--i-select-option-from-dropdownlist.feature

@@ -414,52 +414,38 @@ When(/^(I|we)* fill in( the)* following: by( its)*( "([^"]*)?")* (attribute|attr
 });
 
 /**
- * Selecting the option in the dropdown list field by its text label.
- *
+ * Selecting the option in the dropdown list field by its text label
  * Example: When I select "Mercedes" from "Cars"
+ * Example: When I select "saab" from "#cars"
+ * Example: When I select "Mercedes" from "cars"
  *
  */
-When(/^(I|we)* select "([^"]*)?" from "([^"]*)?"$/, function (pronounCase, option, dropdownlist) {
+When(/^(I|we)* select "([^"]*)?" from "([^"]*)?"$/, function (pronounCase, option, selectList) {
 
-  const elementField = browser.element.findByText(dropdownlist, { exact: true });
-  browser.getAttribute(elementField, 'for', function (eleAttribute) {
-    return browser.waitForElementVisible('css selector', '#' + eleAttribute.value)
-    .click('#' + eleAttribute.value)
-    .click(browser.element.findByText(option, { exact: true }))
-    .click('#' + eleAttribute.value);
-  });
-});
+  const hasASpace = selectList.indexOf(' ');
 
-/**
- * Selects option in select field.
- *
- * Example: When I select "Mercedes" from "cars" its "id" attr
- * Example: When I select "Saab" from "#cars" by attr
- *
- */
-
-When(/^(I|we)* select "([^"]*)?" from "([^"]*)?" by( its)*( "([^"]*)?")* (attribute|attr)$/, function (pronounCase, option, attrValue, itsCase, attr, attrCase) {
-
-  const hasASpace = attrValue.indexOf(' ');
-
-  var selector = '';
-  if((attrValue.startsWith('#') || attrValue.startsWith('.')) && hasASpace == -1){
-    selector = attrValue;
-  }
-  else if (!attr && hasASpace == -1){
-    selector = attrValue + ',#' + attrValue + ',.' + attrValue + ',[name=' + attrValue + "]," + '[value="' + attrValue + '"],[placeholder="' + attrValue + '"]';
+  let selector = '';
+  if((selectList.startsWith('#') || selectList.startsWith('.'))){
+    selector = selectList;
   }
-  else if (!attr && hasASpace > -1){
-    selector ='[value="' + attrValue + '"],[placeholder="' + attrValue + '"]';
+  else if (hasASpace == -1){
+    selector = '[name="' + selectList + '"],[id="' + selectList + '"],[class="' + selectList + '"]';
   }
   else {
-    selector = '[' + attr + '="' + attrValue + '"]';
+    selector = browser.element.findByText(selectList, { exact: true });
   }
 
-  return browser.waitForElementVisible('css selector', selector)
-    .click(selector)
-    .click(browser.element.findByText(option, { exact: true }))
-    .click(selector);
+  let optionValue = '';
+  const result = option.toLowerCase();
+
+  if(result == option){
+    optionValue = '[value="' + option + '"]';
+  }
+  else{
+    optionValue = browser.element.findByText(option, { exact: true });
+  }
+  
+  return browser.click(selector).click(optionValue).click(selector);
 });
 
 /**