Permalink
Browse files

fix build (#1084)

* fix build

* amend

* Bump psycopg2 version

Bug (psycopg/psycopg2#594) which fixed in
2.7.1

* use python image instead of node image

* don't use --user inside virtualenv

* fix javascript linting

* fix js tests

* silence messages for testing

* fix exams test

* fix travis config

* move babel preset to prod dependencies

* fix docs build

* added registrar flag fixing validation error when parsing schools

* updated user settings modal test

* fixed sis btn continually firing

* temp rerunning test snapshots

* removed temp re snapshotting

* Revert "updated user settings modal test"

This reverts commit 5ae71ab.

* manually updated user settings modal test snapshot
  • Loading branch information...
felixzhuologist authored and noahpresler committed Sep 6, 2018
1 parent f5188d7 commit b20d544ea0a93d5a1ee9fde3acc7d9e54432b3ae
Showing with 1,096 additions and 1,077 deletions.
  1. +7 −6 .travis.yml
  2. +3 −3 courses/serializers.py
  3. +5 −5 docs/testing.rst
  4. +886 −895 exams/tests.py
  5. +1 −0 package.json
  6. +3 −0 parsing/library/schemas/config.json
  7. +1 −1 requirements.txt
  8. +3 −0 semesterly/tests.py
  9. +24 −36 static/js/redux/__tests__/modals/__snapshots__/user_settings_modal_test.jsx.snap
  10. +8 −8 static/js/redux/actions/calendar_actions.jsx
  11. +1 −1 static/js/redux/reducers/entities_reducer.js
  12. +0 −1 static/js/redux/reducers/timetables_reducer.jsx
  13. +0 −1 static/js/redux/reducers/ui_reducer.jsx
  14. +1 −1 static/js/redux/ui/alerts/change_semester_alert.jsx
  15. +7 −7 static/js/redux/ui/alerts/conflict_alert.jsx
  16. +5 −5 static/js/redux/ui/alerts/enable_notifications_alert.jsx
  17. +9 −9 static/js/redux/ui/alerts/friends_in_class_alert.jsx
  18. +2 −2 static/js/redux/ui/alerts/new_timetable_alert.jsx
  19. +2 −2 static/js/redux/ui/alerts/timetable_exists_alert.jsx
  20. +17 −13 static/js/redux/ui/calendar.jsx
  21. +2 −5 static/js/redux/ui/day_calendar.jsx
  22. +5 −3 static/js/redux/ui/evaluation_list.jsx
  23. +2 −0 static/js/redux/ui/master_slot.jsx
  24. +2 −2 static/js/redux/ui/modals/course_modal.jsx
  25. +1 −1 static/js/redux/ui/modals/final_exams_modal.jsx
  26. +12 −10 static/js/redux/ui/modals/peer_modal.jsx
  27. +2 −2 static/js/redux/ui/modals/preference_modal.jsx
  28. +16 −16 static/js/redux/ui/modals/signup_modal.jsx
  29. +37 −11 static/js/redux/ui/semesterly.jsx
  30. +6 −5 static/js/redux/ui/side_bar.jsx
  31. +12 −6 static/js/redux/ui/terms_of_service_modal.jsx
  32. +5 −4 static/js/redux/ui/textbook.jsx
  33. +1 −1 static/js/redux/ui/top_bar.jsx
  34. +7 −4 timetable/update_semester_field.py
  35. +1 −11 timetable/utils.py
View
@@ -1,12 +1,11 @@
os: linux
sudo: required
dist: trusty
language: node_js
node_js:
- 7.1.0
language: python
python:
- "2.7"
env:
matrix:
- NODE_ENV=production
- NODE_ENV=production NODE_VERSION="7.1.0"
branches:
only:
- master
@@ -18,11 +17,13 @@ cache:
- $HOME/.npm
- $HOME/.cache/pip
install:
- nvm install $NODE_VERSION
- npm -g install webpack
- npm -g install chromedriver
- npm -g install jest babel-jest
- npm install
- pip install --user -r requirements.txt
- pip install --upgrade pip
- pip install -r requirements.txt
addons:
apt:
sources:
View
@@ -31,9 +31,9 @@ class CourseSerializer(serializers.ModelSerializer):
Serialize a Course into a dictionary with detailed information about the course, and all
related entities (eg Sections). Used for search results and course modals.
Takes a context with parameters:
school: str (required)
semester: Semester (required)
student: Student (optional)
school: str (required)
semester: Semester (required)
student: Student (optional)
"""
evals = serializers.SerializerMethodField()
integrations = serializers.SerializerMethodField()
View
@@ -5,7 +5,7 @@ Running Tests
=============
Frontend
~~~~~~~~
--------
Run all tests::
@@ -16,7 +16,7 @@ Run single test::
npm test -- static/js/redux/__tests__/schema.test.js
Backend
~~~~~~~
-------
Run all tests::
@@ -45,7 +45,7 @@ Writing Tests
=============
Unit Tests
##########
----------
Contributors are encouraged to write unit tests for changed or new code.
By separating out logic into simple pure functions, you can isolate the
@@ -60,7 +60,7 @@ function, or that touches external interfaces. There are a number of strategies
you can use in these cases.
Integration Tests
#################
-----------------
In the frontend, for testing the logic for rendering a component, look into
snapshot tests. For testing async (thunk) action creators, our current tests
create a store with desired initial state, dispatch the action, and then check that the action
@@ -72,7 +72,7 @@ It's also possible to use django's request factory to create requests to provide
directly as input to your views.
End to End Tests
################
----------------
As the name implies, end to end tests test the entire app at once by simulating
a semesterly user. When writing or changing end to end tests, it is recommended
to familiarize yourself with the methods provided in SeleniumTestCase, which
Oops, something went wrong.

0 comments on commit b20d544

Please sign in to comment.