Merge branch 'new-test' into 'red-develop'

# Conflicts:
#   .gitlab-ci.yml

.gitlab-ci.yml

@@ -10,6 +10,15 @@ stages:
 #   - re-deploy-dev
 #   - clean_re-deploy-dev
 
+all_tests:
+  stage: all_tests
+  script:
+   - git clone http://tir:Qwerty1234@54.169.104.100:27015/red/red-ci-cd.git -b new-test
+   - pip install -r red-ci-cd/requirements/local.txt
+   - echo "test"
+   - python3 manage.py test red-ci-cd.test
+   
+   
 
 initial_repo:
   stage: initial_repo

env.ini

+[SETTINGS]
+BATCH_UPLOAD_FORMAT_FILENAME = instruction.pdf
+SSL = 1
+DATABASE_ENGINE = django.db.backends.mysql
+DATABASE_NAME = rms_db
+DATABASE_USER = oneberry
+DATABASE_PASSWORD = 0N3Berryt!r
+DATABASE_HOST = 52.74.129.178
+DATABASE_PORT = 3306
+SESSION_TIMEOUT = 100000
+FRONT_END_URL = http://devweb.rmsv2.oneberrysystem.com
+AUTH_ACCESSS_TOKEN_TIMEOUT = 3600
+USER_DEFAULT_PASSWORD = password
+CATCH_EMAIL = gladys@tirsolutions.com
+CR_LINK = http://localhost:8000/cms/change-request/form/view
+REALTIMESERVER_IP = 127.0.0.1:8000
+DEBUG = False
+app_id = 957253
+key = c29a7f6579108991e79e
+secret = b3df5d55196b5fbd3eff
+cluster = api
+cms_notification = cms_notification
+wow = $wow
+wow2 = $wow2
+
+
+
+[NOTIFICATION_EMAIL]
+APPROVER_MESSAGE = has sent you an APPROVAL REQUEST for change request;RMS-ACTIONREQUIRED
+REQUESTOR_MESSAGE = has APPROVED the change request;RMS-CRAPPROVED
+REQUESTOR_REJECT_MESSAGE = has REJECTED the change request;RMS-CRREJECTED
+VENDOR_ACKNOWLEDGE_MESSAGE = has sent you an ACKNOWLEDGEMENT REQUEST for change request;RMS-ACTIONREQUIRED-VENDOR
+REQUESTOR_ACKNOWLEDGE_MESSAGE = has ACKNOWLEDGED the change request;RMS-CRACKNOWLEDGE
+REQUESTOR_COMPLETION_MESSAGE = has COMPLETED the change request;RMS-CRCOMPLETED
+VENDOR_ACCEPTANCE_MESSAGE = has ACCEPTED the change request;RMS-CRACCEPTED
+VENDOR_REJECT_MESSAGE = has REJECTED the change request;RMS-CRREJECTED-VENDOR
+REVISED_MESSAGE = has REJECTED the change request for your revision;RMS-CRREVISED
+CANCEL_MESSAGE = has CANCELLED the change request;RMS-CRCANCELLED-USERTRIGGER
+APPROVER_REJECT_MESSAGE = has REJECTED the change request for your approval;RMS-CRREJECTED-APPROVER

requirements/local.txt

@@ -11,7 +11,7 @@ CairoSVG==2.4.2
 certifi==2019.6.16
 cffi==1.12.3
 channels==2.2.0
-channels-redis==2.4.0
+channels-redis==2.3.2
 chardet==3.0.4
 colorama==0.4.1
 constantly==15.1.0
@@ -42,7 +42,7 @@ msgpack==0.6.1
 mysqlclient==1.4.2.post1
 ndg-httpsclient==0.5.1
 numpy==1.17.3
-openpyxl==3.0.0
+openpyxl==2.6.4
 pandas==0.25.3
 pep8==1.7.1
 Pillow==6.0.0

test.py

+from rest_framework import status
+from rest_framework.test import APITestCase
+from rest_framework.test import force_authenticate
+from rest_framework.test import APIClient
+from app.entities.models import User
+
+# from api.models import ChatRoom
+
+
+class ChatRoomTest(APITestCase):
+
+
+    fixtures = ['test-data.json']
+
+
+    def test_login2(self):
+        self.url = '/api/v1/auth/login/'
+        self.body = {
+            "username": 'superuser',
+            'password': 'password123'
+        }
+
+        request = self.client.post(self.url, self.body, format='multipart')
+
+        self.assertEqual(request.status_code, status.HTTP_200_OK)
+
+
+
+
+
+

wow.yml

+stages:
+  - wow
+  
+  
+wow:
+  stage: wow
+  when: on_failure
+  script:
+    - echo "hahaha"
\ No newline at end of file