hpi-swt2 / workshop-portal / 588

100%

master: 100%

push

travis-ci

120 1.14 navbar (#136)

* Merge remote-tracking branch 'remotes/origin/dev' into 96-fix-tutor-to-coach

Closes #120, closes #121, closes #122.
# Conflicts:
#	spec/models/ability_spec.rb

* Check if seeding the database works, closes #112.

* Add date range code to seeds. @tom95.

* Fix error preventing new timespans from being added

* Add setup for javascript tests, test to verify add timespan button

* Different approach at blocking until element is available

* Maybe with a higher wait time?

* Let's try poltergeist!

* None ain't working :'(

* Moar debug

* Maybe it's turoblinks?!??!?! DDD:

* It was turbolinks. Cleanup debugging.

* And some more cleanup

* Fulfill navbar requirements for pupil role

* Move menu/dropdown construction code into helper

* Add conditional menus for organizer and admin

* Include coach role in tests

15 of 15 new or added lines in 1 file covered. (100.0%)

306 of 306 relevant lines covered (100.0%)

20.47 hits per line