Skip to content

Commit

Permalink
Fix Autotests (#1066)
Browse files Browse the repository at this point in the history
* fix autotests

* set for all tests

* generalize semester
  • Loading branch information
noahpresler committed Nov 19, 2017
1 parent 7382e13 commit acb2d77
Show file tree
Hide file tree
Showing 4 changed files with 275 additions and 3 deletions.
260 changes: 260 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"boron": "^0.2.3",
"browser-filesaver": "^1.1.1",
"browserify": "^14.3.0",
"chromedriver": "^2.33.2",
"classnames": "^2.2.4",
"clipboard": "^1.7.1",
"css-loader": "^0.28.0",
Expand Down
11 changes: 11 additions & 0 deletions semesterly/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
from timetable.models import Offering
from timetable.models import Section
from timetable.models import Semester
from timetable.utils import get_current_semesters


class SeleniumTestCase(StaticLiveServerTestCase):
Expand Down Expand Up @@ -81,6 +82,12 @@ def setUp(self):
self.img_dir = os.path.dirname(os.path.realpath(__file__)) + '/test_failures'
self.init_screenshot_dir()
self.driver = webdriver.Chrome(chrome_options=self.chrome_options)
sem = get_current_semesters('jhu')[0]
sem, _ = Semester.objects.update_or_create(name=sem['name'], year=sem['year'])
for section in Section.objects.filter(semester__name="Fall", semester__year=2017):
section.semester = sem
section.save()
self.current_sem = sem
self.driver.get(self.get_test_url('jhu'))
WebDriverWait(self.driver, self.TIMEOUT) \
.until(lambda driver: driver.find_element_by_tag_name('body'))
Expand Down Expand Up @@ -498,6 +505,10 @@ def change_term(self, term, clear_alert=False):
term, 'placeholder'
)
)

def change_to_current_term(self, clear_alert=False):
sem = get_current_semesters('jhu')[0]
self.change_term("%s %s" % (sem['name'], sem['year']), clear_alert=clear_alert)

def open_and_query_adv_search(self, query, n_results=None):
"""Open's the advanced search modal and types in the provided query,
Expand Down
6 changes: 3 additions & 3 deletions semesterly/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def test_logged_out_flow(self):
)
])
with self.description("advanced search basic query executes"):
self.change_term("Fall 2017", clear_alert=True)
self.change_to_current_term(clear_alert=True)
sem = Semester.objects.get(year=2017, name='Fall')
self.open_and_query_adv_search('ca', n_results=3)
self.select_nth_adv_search_result(0, sem)
Expand Down Expand Up @@ -126,7 +126,7 @@ def test_logged_in_via_fb_flow(self):
self.search_course('AS.110.106', 1)
self.add_course(0, n_slots=4, n_master_slots=1)
self.save_ptt()
self.change_term("Fall 2017")
self.change_to_current_term()
self.assert_ptt_equals(e2e_ptt)
with self.description(("add friend with course,"
"check for friend circles"
Expand All @@ -139,7 +139,7 @@ def test_logged_in_via_fb_flow(self):
self.create_personal_timetable_obj(
friend,
[Course.objects.get(code='AS.110.105')],
Semester.objects.get(name='Fall', year=2017)
self.current_sem
)
self.assert_ptt_const_across_refresh()
self.assert_friend_image_found(friend)
Expand Down

0 comments on commit acb2d77

Please sign in to comment.