Merge pull request #17 from buildlyio/replace-buildly-ui

Issue #5 - Replace Buildly UI to Buildly React Template

Author: jefmoura

.env

@@ -1,4 +1,4 @@
 BUILDLY_VERSION=0.2.3-rc3
 LOCATION_VERSION=0.0.15
 PRODUCTS_VERSION=0.0.30
-BUILDLY_UI_VERSION=0.0.10-st17
+BUILDLY_REACT_TEMPLATE_VERSION=0.0.10-st17 

docker-compose.yaml

@@ -148,7 +148,7 @@ services:
         -----END PUBLIC KEY-----
       SECRET_KEY: "oxcdb=mtcc7q1cym@oox(lyrz1ncz-(w+(#&u7l-&)7a8wvxyz"
 
-  buildly-react-template:
+  buildly-react-template: 
     container_name: buildly-react-template
     image: buildly/buildly-react-template
     ports:

robot-tests/buildly-ui/keywords.robot robot-tests/buildly-react-template/keywords.robot

@@ -3,11 +3,12 @@ Library         SeleniumLibrary
 Library         String
 Library         RequestsLibrary
 Library         Collections
+Library         BuiltIn
 
 *** Keywords ***
 ##### AUTHENTIFICATION #####
-browser is opened to Buildly-UI URL
-    Go To    ${BUILDLY_UI_BASE_URL}
+browser is opened to Buildly-React-Template URL
+    Go To    ${BUILDLY_REACT_TEMPLATE_BASE_URL}
     ${status}=    Run Keyword And Ignore Error    Wait Until Page Contains    Login   10
     Log  ${status}
     Run Keyword If    'FAIL' in '''${status}'''    Reload Page
@@ -28,11 +29,14 @@ a new user is registered
     Input Text    //input[@placeholder='Enter last name']    Robot
     Click Button    Register
 
-the user can login
-    Go To    ${BUILDLY_UI_BASE_URL}
+the user can login 
+    Go To    ${BUILDLY_REACT_TEMPLATE_BASE_URL}
     Wait Until Page Contains    Login   10
     Location Should Contain    login
     Input Text    //input[@placeholder='Enter username']    ${NEW_USER_NAME}
     Input Text    //input[@placeholder='Enter password']    ${NEW_USER_PASSWORD}
     Click Button    Login
     Wait Until Page Contains    My App    10
+
+
+

robot-tests/buildly-ui/login.robot robot-tests/buildly-react-template/login.robot

@@ -9,8 +9,8 @@ Documentation   Application Login
 
 *** Test Cases ***
 Register new user
-    GIVEN browser is opened to Buildly-React-Template url
+    GIVEN browser is opened to Buildly-React-Template url 
     WHEN a new user is registered
-    THEN the user can login 
+    THEN the user can login
 
 

robot-tests/buildly-ui/variables.robot robot-tests/buildly-react-template/variables.robot

@@ -71,11 +71,11 @@ Set environment to
     Set Global Variable    ${REGULAR_USER_PASSWORD}          ${REGULAR_USER_PASSWORD_${env}}
     Set Global Variable    ${API_USER_USERNAME}              ${API_USER_USERNAME_${env}}
     Set Global Variable    ${API_USER_PASSWORD}              ${API_USER_PASSWORD_${env}}
-    Set Global Variable    ${BUILDLY_REACT_TEMPLATE_BASE_URL}            ${BUILDLY_REACT_TEMPLATE_BASE_URL_${env}}
+    Set Global Variable    ${BUILDLY_REACT_TEMPLATE_BASE_URL}             ${BUILDLY_REACT_TEMPLATE_BASE_URL_${env}}
     Set Global Variable    ${BUILDLY_BASE_URL}               ${BUILDLY_BASE_URL_${env}}
     Set Global Variable    ${PRODUCT_API_BASE_URL}           ${PRODUCT_API_BASE_URL_${env}}
     Set Global Variable    ${LOCATION_API_BASE_URL}          ${LOCATION_API_BASE_URL_${env}}
 
 Generate Random Name
-    ${name}=  Generate Random String  8  	[LOWER]
+    ${name}=  Generate Random String  8  	[LOWER] 
     [RETURN]    ${name}

robot-tests/keywords.robot

@@ -22,4 +22,3 @@ ${BUILDLY_REACT_TEMPLATE_BASE_URL_docker}            http://buildly-react-templa
 ${BUILDLY_BASE_URL_docker}               http://buildly:8080
 ${PRODUCT_API_BASE_URL_docker}           ${BUILDLY_BASE_URL_docker}/products
 ${LOCATION_API_BASE_URL_docker}          ${BUILDLY_BASE_URL_docker}/locations
-