Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 22 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,29 @@ before_install:
- docker --version
- docker-compose version

script:
- docker-compose build db
- docker-compose build static-analysis
- docker-compose build test-postgresql
- docker-compose run test-postgresql
- docker-compose run static-analysis

# desable script to use jobs. Then the process will be execute in parallel
#script:
#- docker-compose build db
#- docker-compose build static-analysis
#- docker-compose build test-postgresql
#- docker-compose run test-postgresql
#- docker-compose run static-analysis

jobs:
include:
- stage: tests
name: "Unit Tests"
script:
- docker-compose build db
- docker-compose build test-postgresql
- docker-compose run test-postgresql

- stage: tests
name: "Static Analysis"
script:
- docker-compose build static-analysis
- docker-compose run static-analysis



Expand Down
3 changes: 2 additions & 1 deletion ThoughtsBackend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ pyjwt==1.7.1
cryptography==2.6.1
parse==1.12.0
psycopg2==2.8.2
Werkzeug==0.16.1
flake8==3.7.7
Werkzeug==0.16.1
1 change: 0 additions & 1 deletion ThoughtsBackend/tests/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@
KwIDAQAB
-----END PUBLIC KEY-----
'''

3 changes: 2 additions & 1 deletion ThoughtsBackend/thoughts_backend/api_namespace.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ def post(self):


search_parser = api_namespace.parser()

search_parser.add_argument('search', type=str, required=False,
help='Search in the text of the thoughts')
help='Search in the text of the thoughts')


@api_namespace.route('/thoughts/')
Expand Down