Commit Graph

1656 Commits

Author SHA1 Message Date
Maximilian Grundke
03141409e8 Fix tests for user_exercise_feedback 2017-11-08 15:41:48 +01:00
Maximilian Grundke
7fa5765cdd Merge remote-tracking branch 'origin/user_exercise_feedback_backend' into user_exercise_feedback_backend 2017-11-08 15:39:52 +01:00
Maximilian Grundke
c4cf11f299 Refactor user redirect after submission 2017-11-08 15:39:04 +01:00
Ralf Teusner
3608712706 forgot some minor changes in spec.. (still work in progress) 2017-11-06 15:38:50 +01:00
Ralf Teusner
ac14e2d0ca first steps towards testing the redirect with regards to user_feedbacks 2017-11-01 11:57:56 +01:00
Ralf Teusner
1551498358 Merge branch 'master' into user_exercise_feedback_backend
# Conflicts:
#	app/views/application/_navigation.html.slim
2017-11-01 10:29:43 +01:00
Ralf Teusner
97d8409557 add association between exercise and user_exercise_feedback 2017-11-01 10:14:52 +01:00
Ralf Teusner
08c7154708 removed duplicate logging statement 2017-11-01 10:14:03 +01:00
rteusner
dbd6db69b7 Merge pull request #136 from openHPI/fix-tests
Fix Tests
2017-11-01 10:10:04 +01:00
Maximilian Grundke
04baf6c5d5 Make paths explicit to fix tests 2017-10-26 16:14:40 +02:00
Maximilian Grundke
0fd993c1cd Move submission url attributes to controller test 2017-10-26 15:48:21 +02:00
Maximilian Grundke
34e96e40be Fix submissions controller test json response 2017-10-26 15:43:14 +02:00
Maximilian Grundke
14a135a0c9 Add explanatory comment to config 2017-10-26 15:42:20 +02:00
Maximilian Grundke
13e33bf977 Add optional logging for tests 2017-10-26 15:42:06 +02:00
Maximilian Grundke
0bade2c2e7 Fix recommending too difficult questions if user has too low level 2017-10-25 14:05:10 +02:00
rteusner
b384dffe34 Merge pull request #135 from ThommyH/fix_proxy_exercises
fixed problem in ProxyExercise that caused: ActiveRecord::Association…
2017-10-25 12:43:20 +02:00
Maximilian Grundke
87f280089d Fix return value of logger being assigned to exercise 2017-10-25 12:07:16 +02:00
Thomas Hille
01aad0a4a6 fixed problem in ProxyExercise that caused: ActiveRecord::AssociationTypeMismatch (Exercise(#51937940) expected, got TrueClass(#7943420)): 2017-10-25 11:28:27 +02:00
rteusner
ed12401d67 Merge pull request #121 from openHPI/error-info
Error info
2017-10-25 10:44:24 +02:00
Ralf Teusner
539b2931c3 changed behaviour of user exercise feedback (max 20 is collected), added some constant for the integers used. 2017-10-25 10:38:27 +02:00
Maximilian Grundke
6d28f427d8 Add Ralf's comment to skipped tests 2017-10-25 10:12:29 +02:00
Maximilian Grundke
ffe4f65628 Adapt lti_spec to current functionality 2017-10-18 22:05:07 +02:00
Maximilian Grundke
a00adbce25 Move *_url spec to controller, because the subscription model does not handle urls anymore 2017-10-16 14:02:40 +02:00
Maximilian Grundke
686d56bbd6 Add rspec persistence file to config to allow for re-running only failed tests locally 2017-10-16 13:20:40 +02:00
Maximilian Grundke
ddeab8c34f Remove auto-generated tests 2017-10-16 13:12:46 +02:00
Maximilian Grundke
d162f78b67 Add filters to index page 2017-10-16 11:45:23 +02:00
Maximilian Grundke
74a4313949 Add feedback to navigation 2017-10-16 11:34:57 +02:00
Maximilian Grundke
12b9365e6e Implement show action 2017-10-15 18:55:33 +02:00
Maximilian Grundke
d353dbaf5b Implement index action. Repair destroy 2017-10-15 18:23:58 +02:00
Maximilian Grundke
9bebbe9a6c Merge remote-tracking branch 'origin/master' into error-info
# Conflicts:
#	app/controllers/concerns/submission_scoring.rb
#	app/views/application/_navigation.html.slim
#	config/locales/de.yml
#	config/locales/en.yml
#	db/schema.rb
2017-10-15 17:02:19 +02:00
Thomas Hille
577f157996 extracted number of interventions per exercise into own variable 2017-10-04 16:51:41 +02:00
Thomas Hille
f7e013ed89 allow only one intervention per user and exercise but 3 interventions per user and day 2017-10-04 16:47:25 +02:00
Ralf Teusner
e52c9213a1 try to activate interpretation of carriage return 2017-10-04 16:42:42 +02:00
Ralf Teusner
b078cddc68 enhance testrun output 2017-10-04 16:18:24 +02:00
rteusner
f4506dcaad Merge pull request #131 from openHPI/fix-empty-question-in-rfc
Fix empty questions in new RFC UI
2017-10-04 15:44:12 +02:00
rteusner
85ee40f118 Merge pull request #130 from openHPI/exercise-collections-ui
Exercise Collections UI
2017-10-04 15:43:01 +02:00
Maximilian Grundke
ee5825c71b Order exercises in form 2017-10-04 15:42:33 +02:00
Maximilian Grundke
2582f55b1e Add navigation link to exercise collections 2017-10-04 14:12:54 +02:00
Maximilian Grundke
e7adb00dc1 Fix empty questions in new RFC UI 2017-10-04 13:22:47 +02:00
Maximilian Grundke
06e99059d4 Add new lines at eof 2017-10-04 12:53:09 +02:00
Maximilian Grundke
70eb0d19b8 Link to exercises contained in collections 2017-10-04 12:47:59 +02:00
Maximilian Grundke
e74c25746c Implement new action 2017-10-04 12:40:37 +02:00
ThommyH
a0ebd5bec5 Update schema.rb 2017-10-04 11:50:57 +02:00
Thomas Hille
0e7decd7fc removed clutter in schema.rb 2017-10-04 11:47:18 +02:00
Thomas Hille
541f829d0f Merge branch 'removeExpectedWorkingTime' of https://github.com/ThommyH/codeocean into removeExpectedWorkingTime 2017-10-04 11:41:45 +02:00
Thomas Hille
95a849e9f5 removed expected working time from show/create/index and database since we do not use it 2017-10-04 11:41:08 +02:00
Maximilian Grundke
8e4a694690 Add title 2017-10-04 11:37:21 +02:00
Maximilian Grundke
7cb7146e7e Implement update 2017-10-04 11:35:51 +02:00
Thomas Hille
bce58071d1 removed expected working time from show/create/index and database since we do not use it 2017-10-03 18:46:39 +02:00
Ralf Teusner
2806d9bf85 specify API version in url used to open the websocket. With version 1.28 and up, docker uses binary frame format for websockets which does not seem to work with FAYE websocket. For API version 1.27 and below, text frame format is used.
+ short fix improvement for empty responses
2017-09-29 16:09:42 +02:00