Skip to content

Commit d649b65

Browse files
authored
Merge pull request #14 from buildlyio/JiseonYu-3
Issue #5 - Replace Buildly UI to Buildly-React-Template
2 parents ae49590 + a929134 commit d649b65

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

robot-tests/keywords.robot

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
Library SeleniumLibrary
33
Library ./get_selenium_browser_log.py
44
Library Process
5+
Library BuiltIn
56

67
*** Variables ***
78
@{chrome_arguments} --disable-infobars --headless --disable-gpu --no-sandbox --window-size=1920,1080
89
${HEADLESS_BROWSER_ENABLED} True
10+
${env}
911

1012
*** Keywords ***
1113
Init
@@ -58,7 +60,8 @@ I am authenticated api user
5860
Should Be Equal As Strings ${resp.status_code} 200
5961

6062
Set environment
61-
Run Keyword If '${env}'!='' Set environment to ${env}
63+
Run Keyword If '${env}'!='' Set environment to ${env}
64+
# Run Keyword If '${env}'=='PASS' Set environment to ${env}
6265

6366
Set environment to
6467
[Arguments] ${env}
@@ -68,7 +71,7 @@ Set environment to
6871
Set Global Variable ${REGULAR_USER_PASSWORD} ${REGULAR_USER_PASSWORD_${env}}
6972
Set Global Variable ${API_USER_USERNAME} ${API_USER_USERNAME_${env}}
7073
Set Global Variable ${API_USER_PASSWORD} ${API_USER_PASSWORD_${env}}
71-
Set Global Variable ${BUILDLY_UI_BASE_URL} ${BUILDLY_UI_BASE_URL_${env}}
74+
Set Global Variable ${BUILDLY_REACT_TEMPLATE_BASE_URL} ${BUILDLY_REACT_TEMPLATE_BASE_URL_${env}}
7275
Set Global Variable ${BUILDLY_BASE_URL} ${BUILDLY_BASE_URL_${env}}
7376
Set Global Variable ${PRODUCT_API_BASE_URL} ${PRODUCT_API_BASE_URL_${env}}
7477
Set Global Variable ${LOCATION_API_BASE_URL} ${LOCATION_API_BASE_URL_${env}}

robot-tests/variables.robot

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ${API_USER_USERNAME} admin
66
${API_USER_PASSWORD} admin
77
${REGULAR_USER_USERNAME} admin
88
${REGULAR_USER_PASSWORD} admin
9-
${BUILDLY_UI_BASE_URL} http://localhost:9001
9+
${BUILDLY_REACT_TEMPLATE_BASE_URL} http://localhost:9001
1010
${BUILDLY_BASE_URL} http://localhost:8080
1111
${PRODUCT_API_BASE_URL} ${BUILDLY_BASE_URL}/products
1212
${LOCATION_API_BASE_URL} ${BUILDLY_BASE_URL}/locations
@@ -18,7 +18,7 @@ ${API_USER_USERNAME_docker} admin
1818
${API_USER_PASSWORD_docker} admin
1919
${REGULAR_USER_USERNAME_docker} admin
2020
${REGULAR_USER_PASSWORD_docker} admin
21-
${BUILDLY_UI_BASE_URL_docker} http://buildly-ui:9000
21+
${BUILDLY_REACT_TEMPLATE_BASE_URL_docker} http://buildly-react-template:9000
2222
${BUILDLY_BASE_URL_docker} http://buildly:8080
2323
${PRODUCT_API_BASE_URL_docker} ${BUILDLY_BASE_URL_docker}/products
2424
${LOCATION_API_BASE_URL_docker} ${BUILDLY_BASE_URL_docker}/locations

0 commit comments

Comments
 (0)