Skip to content

Commit c2b6f7a

Browse files
committed
Remove unneeded lesson param from creates
1 parent 49f41e2 commit c2b6f7a

1 file changed

Lines changed: 9 additions & 10 deletions

File tree

spec/features/school_class/listing_school_classes_spec.rb

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
remix = create(
126126
:project,
127127
school: school,
128-
lesson: lesson,
129128
parent: lesson.project,
130129
remixed_from_id: lesson.project.id,
131130
user_id: student.id
@@ -165,16 +164,16 @@
165164

166165
# Class 1: Create 2 remixes with unread feedback
167166
lesson_one = create(:lesson, school:, school_class:, visibility: 'students', user_id: teacher.id)
168-
remix_one = create(:project, school:, lesson: lesson_one, parent: lesson_one.project, remixed_from_id: lesson_one.project.id, user_id: student.id)
167+
remix_one = create(:project, school:, parent: lesson_one.project, remixed_from_id: lesson_one.project.id, user_id: student.id)
169168
create(:feedback, school_project: remix_one.school_project, user_id: teacher.id, content: 'Unread 1', read_at: nil)
170169

171170
lesson_two = create(:lesson, school:, school_class:, visibility: 'students', user_id: teacher.id)
172-
remix_two = create(:project, school:, lesson: lesson_two, parent: lesson_two.project, remixed_from_id: lesson_two.project.id, user_id: student.id)
171+
remix_two = create(:project, school:, parent: lesson_two.project, remixed_from_id: lesson_two.project.id, user_id: student.id)
173172
create(:feedback, school_project: remix_two.school_project, user_id: teacher.id, content: 'Unread 2', read_at: nil)
174173

175174
# Class 2: Create 1 remix with unread feedback
176175
lesson_three = create(:lesson, school:, school_class: school_class_2, visibility: 'students', user_id: teacher.id)
177-
remix_three = create(:project, school:, lesson: lesson_three, parent: lesson_three.project, remixed_from_id: lesson_three.project.id, user_id: student.id)
176+
remix_three = create(:project, school:, parent: lesson_three.project, remixed_from_id: lesson_three.project.id, user_id: student.id)
178177
create(:feedback, school_project: remix_three.school_project, user_id: teacher.id, content: 'Unread 3', read_at: nil)
179178

180179
get("/api/schools/#{school.id}/classes", headers:)
@@ -192,7 +191,7 @@
192191
stub_user_info_api_for(teacher)
193192

194193
lesson = create(:lesson, school:, school_class:, visibility: 'students', user_id: teacher.id)
195-
remix = create(:project, school:, lesson:, parent: lesson.project, remixed_from_id: lesson.project.id, user_id: student.id)
194+
remix = create(:project, school:, parent: lesson.project, remixed_from_id: lesson.project.id, user_id: student.id)
196195

197196
create(:feedback, school_project: remix.school_project, user_id: teacher.id, content: 'Already read', read_at: Time.current)
198197

@@ -219,7 +218,7 @@
219218
stub_user_info_api_for(teacher)
220219

221220
lesson = create(:lesson, school:, school_class:, visibility: 'students', user_id: teacher.id)
222-
remix = create(:project, school:, lesson:, parent: lesson.project, remixed_from_id: lesson.project.id, user_id: student.id)
221+
remix = create(:project, school:, parent: lesson.project, remixed_from_id: lesson.project.id, user_id: student.id)
223222

224223
# Multiple unread feedback on the same project should count as 1
225224
create(:feedback, school_project: remix.school_project, user_id: teacher.id, content: 'Unread 1', read_at: nil)
@@ -243,11 +242,11 @@
243242
lesson = create(:lesson, school:, school_class:, visibility: 'students', user_id: teacher.id)
244243

245244
# Current student's remix with unread feedback
246-
my_remix = create(:project, school:, lesson:, parent: lesson.project, remixed_from_id: lesson.project.id, user_id: student.id)
245+
my_remix = create(:project, school:, parent: lesson.project, remixed_from_id: lesson.project.id, user_id: student.id)
247246
create(:feedback, school_project: my_remix.school_project, user_id: teacher.id, content: 'My unread', read_at: nil)
248247

249248
# Other student's remix with unread feedback (should not count)
250-
other_remix = create(:project, school:, lesson:, parent: lesson.project, remixed_from_id: lesson.project.id, user_id: other_student.id)
249+
other_remix = create(:project, school:, parent: lesson.project, remixed_from_id: lesson.project.id, user_id: other_student.id)
251250
create(:feedback, school_project: other_remix.school_project, user_id: teacher.id, content: 'Other unread', read_at: nil)
252251

253252
get("/api/schools/#{school.id}/classes", headers:)
@@ -263,12 +262,12 @@
263262

264263
# Visible lesson
265264
visible_lesson = create(:lesson, school:, school_class:, visibility: 'students', user_id: teacher.id)
266-
visible_remix = create(:project, school:, lesson: visible_lesson, parent: visible_lesson.project, remixed_from_id: visible_lesson.project.id, user_id: student.id)
265+
visible_remix = create(:project, school:, parent: visible_lesson.project, remixed_from_id: visible_lesson.project.id, user_id: student.id)
267266
create(:feedback, school_project: visible_remix.school_project, user_id: teacher.id, content: 'Visible', read_at: nil)
268267

269268
# Hidden lesson (visibility: 'teachers')
270269
hidden_lesson = create(:lesson, school:, school_class:, visibility: 'teachers', user_id: teacher.id)
271-
hidden_remix = create(:project, school:, lesson: hidden_lesson, parent: hidden_lesson.project, remixed_from_id: hidden_lesson.project.id, user_id: student.id)
270+
hidden_remix = create(:project, school:, parent: hidden_lesson.project, remixed_from_id: hidden_lesson.project.id, user_id: student.id)
272271
create(:feedback, school_project: hidden_remix.school_project, user_id: teacher.id, content: 'Hidden', read_at: nil)
273272

274273
get("/api/schools/#{school.id}/classes", headers:)

0 commit comments

Comments
 (0)