Skip to content

Commit 61ddafe

Browse files
kyler-instructureBryan Madsen
authored andcommitted
spec: calendar2 fixes for clicking calendar entry.
Change-Id: I88145b7dadf8731b08a10be7a1c7c3cec561a9eb Reviewed-on: https://gerrit.instructure.com/19279 Reviewed-by: Bryan Madsen <bryan@instructure.com> Product-Review: Bryan Madsen <bryan@instructure.com> QA-Review: Bryan Madsen <bryan@instructure.com> Tested-by: Jenkins <jenkins@instructure.com>
1 parent 35e1904 commit 61ddafe

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

spec/selenium/calendar2_spec.rb

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,12 @@ def create_middle_day_assignment(name = 'new assignment')
231231
it "should go to assignment page when clicking assignment title" do
232232
name = 'special assignment'
233233
create_middle_day_assignment(name)
234-
f('.fc-event.assignment').click
235-
wait_for_ajaximations
236-
driver.execute_script("$('.view_event_link').hover().click()")
234+
keep_trying_until do
235+
fj('.fc-event.assignment').click
236+
wait_for_ajaximations
237+
driver.execute_script("$('.view_event_link').hover().click()")
238+
fj('h2.title').displayed?
239+
end
237240

238241
f('h2.title').text.should include(name)
239242
end
@@ -264,16 +267,19 @@ def create_middle_day_assignment(name = 'new assignment')
264267

265268
it "should delete an assignment" do
266269
create_middle_day_assignment
267-
fj('.fc-event').click
268-
driver.execute_script("$('.delete_event_link').hover().click()")
270+
keep_trying_until do
271+
fj('.fc-event-inner').click()
272+
driver.execute_script("$('.delete_event_link').hover().click()")
273+
fj('.ui-dialog .ui-dialog-buttonset').displayed?
274+
end
269275
wait_for_ajaximations
270276
driver.execute_script("$('.ui-dialog:visible .btn-primary').hover().click()")
271277
wait_for_ajaximations
272-
fj('.fc-event').should be_nil
278+
fj('.fc-event-inner').should be_nil
273279
# make sure it was actually deleted and not just removed from the interface
274280
get("/calendar2")
275281
wait_for_ajax_requests
276-
fj('.fc-event').should be_nil
282+
fj('.fc-event-inner').should be_nil
277283
end
278284

279285
it "should let me message students who have signed up for an appointment" do

0 commit comments

Comments
 (0)