Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
bb96839
Merge pull request #3 from Diplex09/employee-relation-ica-class-change
Sreddx Jun 4, 2022
91ae446
fix minor error
Abraham935 Jun 4, 2022
a00d0c4
Expenses backend created
Abraham935 Jun 5, 2022
5954c0c
Moved app.py to backend folder
mannynacc Jun 5, 2022
233dd2f
config.ini in backend
mannynacc Jun 5, 2022
ff38de5
ICA endpoints and functions
mannynacc Jun 5, 2022
07cca47
Removed 'backend.' from imports
AlonsoMtzG Jun 6, 2022
5286832
Display All Expenses info
Abraham935 Jun 6, 2022
5db0c74
Add New AllExpense working
Abraham935 Jun 6, 2022
85fa1ab
Finished ICA View
AlonsoMtzG Jun 6, 2022
5311d99
Delete expense added
Abraham935 Jun 6, 2022
1113897
Merge branch 'development' of https://github.com/Diplex09/ibm-project…
Abraham935 Jun 6, 2022
6e1c2fb
Solve a problem when adding/editing new hour
Abraham935 Jun 6, 2022
78cd0cc
Temporary text in ICAS view to avoid backend errors
AlonsoMtzG Jun 6, 2022
27bd4d9
Merge branch 'development' of https://github.com/Diplex09/ibm-project…
AlonsoMtzG Jun 6, 2022
51fb318
Update Expenses Backend
Abraham935 Jun 6, 2022
da8bcd8
Edit Expenses almost done
Abraham935 Jun 6, 2022
824057b
Return type on postType endpoint
mannynacc Jun 7, 2022
d950284
ICA endpoints fixed
mannynacc Jun 7, 2022
86cb3fc
Modify existing expense record working
Abraham935 Jun 7, 2022
0d994a6
Closing Modal when adding employee
Abraham935 Jun 7, 2022
fdf6799
ICAs view is now shown
AlonsoMtzG Jun 7, 2022
d1f33f7
Added URL in auth actions
AlonsoMtzG Jun 10, 2022
fa85356
Fixed ICA post function
Sreddx Jun 10, 2022
3af108b
Removed comment so get ICA is called
Sreddx Jun 10, 2022
252831c
testAction
Sreddx Jun 12, 2022
700f652
Postman collection json
Sreddx Jun 14, 2022
471b9de
Integration testing of postman collection
Sreddx Jun 14, 2022
d37d9ae
Change to yml config
Sreddx Jun 14, 2022
f848709
Postman Integration Testing files
Sreddx Jun 15, 2022
5281254
Fix ICA endpoints
Abraham935 Jun 15, 2022
f392c8a
Newman integration action
Sreddx Jun 15, 2022
fe8c289
Fixed minor error
Sreddx Jun 15, 2022
4e45f26
Deleted wrong collection
Sreddx Jun 15, 2022
4884855
Good collection file
Sreddx Jun 15, 2022
59eb4ca
Fixed endpoints
Abraham935 Jun 15, 2022
779d285
Merge pull request #6 from Diplex09/integration-testing
Sreddx Jun 16, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/integrationTesting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Newman Test Run
on:
push:
branches:
- development
pull_request:
branches:
- development
jobs:
newman:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: matt-ball/newman-action@master
with:
collection: LERT/backend/LERT Integration Tests.postman_collection.json
environment: LERT/backend/LERT.postman_environment.json
75 changes: 75 additions & 0 deletions .github/workflows/integrationTestingPostman.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: CI - Integration Test

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [ integration-testing ]
pull_request:
branches: [ integration-testing ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
python-version: [3.x]
services:
# Label used to access the service container
postgres:
image: postgres:latest
env:
POSTGRES_DB: lert
POSTGRES_PASSWORD: password
POSTGRES_USER: postgres
ports:
- 5432:5432
# Set health checks to wait until postgres has started
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5


# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Git checkout
uses: actions/checkout@v2

- name: Install Node JS ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
if [ -f api/requirements.txt ]; then pip install -r api/requirements.txt; fi
- name: Install Newman dependency
run: npm install --prefix tests/postman/
- name: Setup Database
env:
POSTGRES_HOST: localhost
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
- name: Run the API and Postman's tests
run: |
cd api && flask run &
sleep 2
cd tests/postman/ && ./node_modules/newman/bin/newman.js run LERT Integration Tests.postman_collection.json -e ahm-local.postman_environment.json
kill -9 `lsof -i:5000 -t`
env:
FLASK_ENV: development
API_HOST: localhost
FLASK_APP: main.py

CI: true
36 changes: 0 additions & 36 deletions .github/workflows/testActions.yml

This file was deleted.

Loading