Skip to content

Commit 70a8dcd

Browse files
chinmaymudholkar1chinmaymudholkar1
committed
New logins
1 parent 1e5da66 commit 70a8dcd

File tree

2 files changed

+45
-24
lines changed

2 files changed

+45
-24
lines changed

‎.github/workflows/MAVIS_TEST.yml‎

Lines changed: 45 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ jobs:
3737
pip install flake8 pytest
3838
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
3939
playwright install
40-
playwright install-deps
4140
- name: Lint with flake8
4241
run: |
4342
# stop the build if there are Python syntax errors or undefined names
@@ -49,10 +48,11 @@ jobs:
4948
HEADLESS: ${{ vars.HEADLESS }}
5049
CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
5150
TEST_URL: ${{ vars.TEST_URL }}
52-
PARENTAL_CONSENT_URL: ${{ vars.PARENTAL_CONSENT_URL }}
5351
RESET_ENDPOINT: ${{ vars.RESET_ENDPOINT }}
54-
LOGIN_PASSWORD: ${{ secrets.LOGIN_PASSWORD }}
55-
LOGIN_USERNAME: ${{ secrets.LOGIN_USERNAME }}
52+
NURSE_PASSWORD: ${{ secrets.NURSE_PASSWORD }}
53+
NURSE_USERNAME: ${{ secrets.NURSE_USERNAME }}
54+
SUPERUSER_PASSWORD: ${{ secrets.SUPERUSER_PASSWORD }}
55+
SUPERUSER_USERNAME: ${{ secrets.SUPERUSER_USERNAME }}
5656
TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
5757
TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
5858
API_TOKEN: ${{ secrets.API_TOKEN }}
@@ -65,10 +65,11 @@ jobs:
6565
HEADLESS: ${{ vars.HEADLESS }}
6666
CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
6767
TEST_URL: ${{ vars.TEST_URL }}
68-
PARENTAL_CONSENT_URL: ${{ vars.PARENTAL_CONSENT_URL }}
6968
RESET_ENDPOINT: ${{ vars.RESET_ENDPOINT }}
70-
LOGIN_PASSWORD: ${{ secrets.LOGIN_PASSWORD }}
71-
LOGIN_USERNAME: ${{ secrets.LOGIN_USERNAME }}
69+
NURSE_PASSWORD: ${{ secrets.NURSE_PASSWORD }}
70+
NURSE_USERNAME: ${{ secrets.NURSE_USERNAME }}
71+
SUPERUSER_PASSWORD: ${{ secrets.SUPERUSER_PASSWORD }}
72+
SUPERUSER_USERNAME: ${{ secrets.SUPERUSER_USERNAME }}
7273
TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
7374
TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
7475
API_TOKEN: ${{ secrets.API_TOKEN }}
@@ -81,26 +82,45 @@ jobs:
8182
HEADLESS: ${{ vars.HEADLESS }}
8283
CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
8384
TEST_URL: ${{ vars.TEST_URL }}
84-
PARENTAL_CONSENT_URL: ${{ vars.PARENTAL_CONSENT_URL }}
8585
RESET_ENDPOINT: ${{ vars.RESET_ENDPOINT }}
86-
LOGIN_PASSWORD: ${{ secrets.LOGIN_PASSWORD }}
87-
LOGIN_USERNAME: ${{ secrets.LOGIN_USERNAME }}
86+
NURSE_PASSWORD: ${{ secrets.NURSE_PASSWORD }}
87+
NURSE_USERNAME: ${{ secrets.NURSE_USERNAME }}
88+
SUPERUSER_PASSWORD: ${{ secrets.SUPERUSER_PASSWORD }}
89+
SUPERUSER_USERNAME: ${{ secrets.SUPERUSER_USERNAME }}
8890
TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
8991
TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
9092
API_TOKEN: ${{ secrets.API_TOKEN }}
9193
run: |
9294
echo "::group::Firefox"
9395
pytest --browser_or_device firefox
9496
echo "::endgroup::"
97+
- name: Test on Edge
98+
env:
99+
HEADLESS: ${{ vars.HEADLESS }}
100+
CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
101+
TEST_URL: ${{ vars.TEST_URL }}
102+
RESET_ENDPOINT: ${{ vars.RESET_ENDPOINT }}
103+
NURSE_PASSWORD: ${{ secrets.NURSE_PASSWORD }}
104+
NURSE_USERNAME: ${{ secrets.NURSE_USERNAME }}
105+
SUPERUSER_PASSWORD: ${{ secrets.SUPERUSER_PASSWORD }}
106+
SUPERUSER_USERNAME: ${{ secrets.SUPERUSER_USERNAME }}
107+
TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
108+
TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
109+
API_TOKEN: ${{ secrets.API_TOKEN }}
110+
run: |
111+
echo "::group::Edge"
112+
pytest --browser_or_device msedge
113+
echo "::endgroup::"
95114
- name: Test on iPhone 14
96115
env:
97116
HEADLESS: ${{ vars.HEADLESS }}
98117
CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
99118
TEST_URL: ${{ vars.TEST_URL }}
100-
PARENTAL_CONSENT_URL: ${{ vars.PARENTAL_CONSENT_URL }}
101119
RESET_ENDPOINT: ${{ vars.RESET_ENDPOINT }}
102-
LOGIN_PASSWORD: ${{ secrets.LOGIN_PASSWORD }}
103-
LOGIN_USERNAME: ${{ secrets.LOGIN_USERNAME }}
120+
NURSE_PASSWORD: ${{ secrets.NURSE_PASSWORD }}
121+
NURSE_USERNAME: ${{ secrets.NURSE_USERNAME }}
122+
SUPERUSER_PASSWORD: ${{ secrets.SUPERUSER_PASSWORD }}
123+
SUPERUSER_USERNAME: ${{ secrets.SUPERUSER_USERNAME }}
104124
TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
105125
TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
106126
API_TOKEN: ${{ secrets.API_TOKEN }}
@@ -113,10 +133,11 @@ jobs:
113133
HEADLESS: ${{ vars.HEADLESS }}
114134
CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
115135
TEST_URL: ${{ vars.TEST_URL }}
116-
PARENTAL_CONSENT_URL: ${{ vars.PARENTAL_CONSENT_URL }}
117136
RESET_ENDPOINT: ${{ vars.RESET_ENDPOINT }}
118-
LOGIN_PASSWORD: ${{ secrets.LOGIN_PASSWORD }}
119-
LOGIN_USERNAME: ${{ secrets.LOGIN_USERNAME }}
137+
NURSE_PASSWORD: ${{ secrets.NURSE_PASSWORD }}
138+
NURSE_USERNAME: ${{ secrets.NURSE_USERNAME }}
139+
SUPERUSER_PASSWORD: ${{ secrets.SUPERUSER_PASSWORD }}
140+
SUPERUSER_USERNAME: ${{ secrets.SUPERUSER_USERNAME }}
120141
TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
121142
TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
122143
API_TOKEN: ${{ secrets.API_TOKEN }}
@@ -129,10 +150,11 @@ jobs:
129150
HEADLESS: ${{ vars.HEADLESS }}
130151
CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
131152
TEST_URL: ${{ vars.TEST_URL }}
132-
PARENTAL_CONSENT_URL: ${{ vars.PARENTAL_CONSENT_URL }}
133153
RESET_ENDPOINT: ${{ vars.RESET_ENDPOINT }}
134-
LOGIN_PASSWORD: ${{ secrets.LOGIN_PASSWORD }}
135-
LOGIN_USERNAME: ${{ secrets.LOGIN_USERNAME }}
154+
NURSE_PASSWORD: ${{ secrets.NURSE_PASSWORD }}
155+
NURSE_USERNAME: ${{ secrets.NURSE_USERNAME }}
156+
SUPERUSER_PASSWORD: ${{ secrets.SUPERUSER_PASSWORD }}
157+
SUPERUSER_USERNAME: ${{ secrets.SUPERUSER_USERNAME }}
136158
TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
137159
TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
138160
API_TOKEN: ${{ secrets.API_TOKEN }}
@@ -145,10 +167,11 @@ jobs:
145167
HEADLESS: ${{ vars.HEADLESS }}
146168
CAPTURE_SCREENSHOTS: ${{ vars.CAPTURE_SCREENSHOTS }}
147169
TEST_URL: ${{ vars.TEST_URL }}
148-
PARENTAL_CONSENT_URL: ${{ vars.PARENTAL_CONSENT_URL }}
149170
RESET_ENDPOINT: ${{ vars.RESET_ENDPOINT }}
150-
LOGIN_PASSWORD: ${{ secrets.LOGIN_PASSWORD }}
151-
LOGIN_USERNAME: ${{ secrets.LOGIN_USERNAME }}
171+
NURSE_PASSWORD: ${{ secrets.NURSE_PASSWORD }}
172+
NURSE_USERNAME: ${{ secrets.NURSE_USERNAME }}
173+
SUPERUSER_PASSWORD: ${{ secrets.SUPERUSER_PASSWORD }}
174+
SUPERUSER_USERNAME: ${{ secrets.SUPERUSER_USERNAME }}
152175
TEST_PASSWORD: ${{ secrets.TEST_PASSWORD }}
153176
TEST_USERNAME: ${{ secrets.TEST_USERNAME }}
154177
API_TOKEN: ${{ secrets.API_TOKEN }}

‎libs/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class CurrentExecution:
2020
nurse_password: str = ""
2121
superuser_username: str = ""
2222
superuser_password: str = ""
23-
parental_consent_url: str = ""
2423
reset_endpoint: str = ""
2524
api_token: str = ""
2625

@@ -36,7 +35,6 @@ def get_env_values():
3635
CurrentExecution.superuser_password = os.getenv("SUPERUSER_PASSWORD")
3736
CurrentExecution.headless_mode = os.getenv("HEADLESS").lower() == "true"
3837
CurrentExecution.capture_screenshot_flag = os.getenv("CAPTURE_SCREENSHOTS").lower() == "true"
39-
CurrentExecution.parental_consent_url = os.getenv("PARENTAL_CONSENT_URL")
4038
CurrentExecution.reset_endpoint = os.getenv("RESET_ENDPOINT")
4139
CurrentExecution.api_token = os.getenv("API_TOKEN")
4240

0 commit comments

Comments
 (0)