Skip to content

Commit 08c8fbf

Browse files
committed
fix: chnange selectors to deflake specs
debug logging
1 parent c2a68f5 commit 08c8fbf

File tree

3 files changed

+32
-19
lines changed

3 files changed

+32
-19
lines changed

spec/system/casa_cases/edit_spec.rb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,21 @@
4444

4545
find(".ts-control").click
4646

47-
ts_checkboxes = page.all(".ts-dropdown-content input")
47+
page.all(".ts-dropdown-content input")
4848

4949
select_all_el = page.find("span[data-test=select-all-input]")
5050
# uncheck all contact type options
5151
select_all_el.click
52-
ts_checkboxes.each do |el|
53-
expect(el).not_to be_checked
52+
within ".ts-dropdown-content" do
53+
expect(page).not_to have_css(".form-check-input--checked")
54+
expect(page).to have_css(".form-check-input--unchecked", count: 3)
5455
end
5556
# check all contact type options
5657
select_all_el.click
57-
expect(ts_checkboxes).to all(be_checked)
58+
within ".ts-dropdown-content" do
59+
expect(page).not_to have_css("input.form-check-input--unchecked")
60+
expect(page).to have_css("input.form-check-input--checked", count: 3)
61+
end
5862

5963
# unselect contact_type from dropdown
6064
find("span", text: contact_type.name).click

spec/system/casa_cases/new_spec.rb

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,19 @@
3434

3535
find(".ts-control").click
3636

37-
ts_checkboxes = page.all(".ts-dropdown-content input")
3837
select_all_el = page.find("span[data-test=select-all-input]")
3938
# uncheck all contact type options
4039
select_all_el.click
41-
ts_checkboxes.each do |el|
42-
expect(el).not_to be_checked
40+
within ".ts-dropdown-content" do
41+
expect(page).not_to have_css(".form-check-input--checked")
42+
expect(page).to have_css(".form-check-input--unchecked", count: 2)
4343
end
4444
# check all contact type options
4545
select_all_el.click
46-
expect(ts_checkboxes).to all(be_checked)
46+
within ".ts-dropdown-content" do
47+
expect(page).not_to have_css("input.form-check-input--unchecked")
48+
expect(page).to have_css("input.form-check-input--checked", count: 2)
49+
end
4750

4851
select "Test User", from: "casa_case[case_assignments_attributes][0][volunteer_id]"
4952

spec/system/case_contacts/followups/resolve_spec.rb

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
require "rails_helper"
22

33
RSpec.describe "followups/resolve", :js, type: :system do
4-
include ActiveJob::TestHelper
5-
64
let(:casa_org) { create(:casa_org) }
75
let(:admin) { create(:casa_admin, casa_org: casa_org) }
86
let(:supervisor) { build(:supervisor, casa_org: casa_org) }
@@ -13,11 +11,13 @@
1311
let(:case_contact) { build(:case_contact, casa_case: casa_case, creator: cc_creator) }
1412
let!(:followup) { create(:followup, case_contact: case_contact, creator: followup_creator) }
1513

14+
before { sign_in admin }
15+
1616
it "changes status of followup to resolved" do
17-
sign_in admin
1817
visit casa_case_path(case_contact.casa_case)
1918

20-
perform_enqueued_jobs { click_button "Resolve Reminder" }
19+
click_button "Resolve Reminder"
20+
expect(page).to have_button("Make Reminder")
2121

2222
expect(case_contact.followups.count).to eq(1)
2323
expect(case_contact.followups.first.resolved?).to be_truthy
@@ -27,11 +27,13 @@
2727
let(:cc_creator) { volunteer }
2828
let(:followup_creator) { volunteer }
2929

30-
xit "changes status of followup to resolved" do # TODO make test not flaky
31-
sign_in admin
30+
before { sign_in admin }
31+
32+
it "changes status of followup to resolved" do # TODO make test not flaky
3233
visit casa_case_path(case_contact.casa_case)
3334

3435
click_button "Resolve Reminder"
36+
expect(page).to have_button("Make Reminder")
3537

3638
expect(case_contact.followups.count).to eq(1)
3739
expect(case_contact.followups.first.resolved?).to be_truthy
@@ -41,7 +43,8 @@
4143
sign_in admin
4244
visit casa_case_path(case_contact.casa_case)
4345

44-
perform_enqueued_jobs { click_button "Resolve Reminder" }
46+
click_button "Resolve Reminder"
47+
expect(page).to have_button("Make Reminder")
4548

4649
expect(page).to have_button("Make Reminder")
4750
end
@@ -51,11 +54,13 @@
5154
let(:cc_creator) { supervisor }
5255
let(:followup_creator) { volunteer }
5356

57+
before { sign_in supervisor }
58+
5459
it "changes status of followup to resolved" do
55-
sign_in supervisor
5660
visit casa_case_path(case_contact.casa_case)
5761

58-
perform_enqueued_jobs { click_button "Resolve Reminder" }
62+
click_button "Resolve Reminder"
63+
expect(page).to have_button("Make Reminder")
5964

6065
expect(case_contact.followups.count).to eq(1)
6166
expect(case_contact.followups.first.resolved?).to be_truthy
@@ -68,13 +73,14 @@
6873

6974
before do
7075
case_contact.casa_case.assigned_volunteers << volunteer
76+
sign_in volunteer
7177
end
7278

7379
it "changes status of followup to resolved" do
74-
sign_in volunteer
7580
visit case_contacts_path
7681

77-
perform_enqueued_jobs { click_button "Resolve Reminder" }
82+
click_button "Resolve Reminder"
83+
expect(page).to have_button("Make Reminder")
7884

7985
expect(case_contact.followups.count).to eq(1)
8086
expect(case_contact.followups.first.resolved?).to be_truthy

0 commit comments

Comments
 (0)