-
Notifications
You must be signed in to change notification settings - Fork 52
Add_UI_Test/Cypress/Basic_tests #190
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Lisafiluz
wants to merge
42
commits into
PythonFreeCourse:develop
Choose a base branch
from
Lisafiluz:develop
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
42 commits
Select commit
Hold shift + click to select a range
2d1f05d
cypress-base
fd0a9bb
cypress-build
8a14390
cypress-build
8583d31
cypress-build
2f61089
readme
219ad38
Merge branch 'main' of https://github.com/PythonFreeCourse/calendar i…
89aaeec
pull from dev
0b9bed3
merge changes
d1e4cfe
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
77d135e
profile page tests
25aa774
Merge pull request #1 from PythonFreeCourse/develop
Lisafiluz b9a5bfb
delete-user
30b8975
delete_all_events_of_the_user
7f9e405
Merge pull request #2 from Lisafiluz/delete-user
Lisafiluz d1217d6
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
34b2bf4
delete-user\add-confirmation
fb5aa93
Merge pull request #3 from Lisafiluz/delete-user
Lisafiluz ba9838d
delete-user/fix_comments
cdeddaf
Merge pull request #4 from Lisafiluz/delete-user
Lisafiluz 695f0d6
Merge pull request #5 from PythonFreeCourse/develop
Lisafiluz 8b8a5ac
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
9d5c5c8
update readme
bdac43f
Merge branch 'develop' of https://github.com/Lisafiluz/calendar into …
fd405a0
Merge pull request #8 from Lisafiluz/add-cypress
Lisafiluz 281ab2c
add git idnore
1e833d7
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
bb2e36e
Delete tests/tests-ui/node_modules directory
Lisafiluz ae1486d
Merge branch 'develop' of https://github.com/Lisafiluz/calendar into …
8fc8c42
add_cypress_basic_templates
fdfd5bc
Merge pull request #10 from Lisafiluz/add-cypress
Lisafiluz 4c0d3b8
Update database.py
Lisafiluz 41c62a7
Update profile.py
Lisafiluz e07816c
Update test_profile.py
Lisafiluz 602a5f3
Merge branch 'develop' into develop
Lisafiluz 4d751bc
Merge branch 'develop' into develop
Lisafiluz f3aeb5d
Update cy_HomePage_Resolution.js
Lisafiluz 1b5b1fe
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
c7568d6
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
fb10553
conflicts_fix
cc9b06e
Merge branch 'develop' of https://github.com/Lisafiluz/calendar into …
e3a9bc4
Merge branch 'develop' into add-cypress
Lisafiluz b8cd8d3
Merge pull request #12 from Lisafiluz/add-cypress
Lisafiluz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -157,6 +157,9 @@ app/.vscode/ | |
|
||
app/routers/stam | ||
|
||
# Cypress | ||
tests/tests-ui/node_modules/ | ||
|
||
# PyCharm | ||
.idea | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
import os | ||
|
||
from sqlalchemy import create_engine | ||
from sqlalchemy.ext.declarative import declarative_base | ||
from sqlalchemy.orm import sessionmaker | ||
|
||
|
||
from app import config | ||
|
||
|
||
SQLALCHEMY_DATABASE_URL = os.getenv( | ||
"DATABASE_CONNECTION_STRING", config.DEVELOPMENT_DATABASE_STRING) | ||
|
||
|
||
def create_env_engine(psql_environment, sqlalchemy_database_url): | ||
if not psql_environment: | ||
return create_engine( | ||
sqlalchemy_database_url, connect_args={"check_same_thread": False}) | ||
|
||
return create_engine(sqlalchemy_database_url) | ||
|
||
|
||
engine = create_env_engine(config.PSQL_ENVIRONMENT, SQLALCHEMY_DATABASE_URL) | ||
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) | ||
|
||
Base = declarative_base() | ||
|
||
|
||
def get_db(): | ||
db = SessionLocal() | ||
try: | ||
yield db | ||
finally: | ||
db.close() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
import datetime | ||
import io | ||
|
||
from loguru import logger | ||
|
@@ -40,7 +41,13 @@ def get_placeholder_user(): | |
async def profile( | ||
request: Request, | ||
session=Depends(get_db), | ||
<<<<<<< HEAD | ||
new_user=Depends(get_placeholder_user), | ||
new_event=Depends(get_placeholder_event)): | ||
|
||
======= | ||
new_user=Depends(get_placeholder_user)): | ||
>>>>>>> b91708d299bde83bbd10ff93496b23af9d35dd8f | ||
Comment on lines
+44
to
+50
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. conflict. |
||
# Get relevant data from database | ||
upcoming_events = range(5) | ||
user = session.query(User).filter_by(id=1).first() | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
{ | ||
"baseUrl": "http://localhost:8000", | ||
"viewportWidth": 1920, | ||
"viewportHeight": 1080, | ||
"pageLoadTimeout": 30000, | ||
"requestTimeout": 10000, | ||
"responseTimeout": 35000, | ||
"defaultCommandTimeout": 20000, | ||
"retries": 1, | ||
"env": { | ||
"user": "_user_qa", | ||
"password": "TheBestPassword123", | ||
"level": 1 | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"name": "Using fixtures to represent data", | ||
"email": "[email protected]", | ||
"body": "Fixtures are a great way to mock data for responses to routes" | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"id": 8739, | ||
"name": "Jane", | ||
"email": "[email protected]" | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.