Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ GEM
prism (>= 1.3.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.19.3)
json (2.19.5)
language_server-protocol (3.17.0.5)
launchy (3.1.1)
addressable (~> 2.8)
Expand Down Expand Up @@ -255,7 +255,7 @@ GEM
bigdecimal (>= 3.0)
ostruct (>= 0.2)
ostruct (0.6.3)
parallel (2.0.1)
parallel (2.1.0)
parser (3.3.11.1)
ast (~> 2.4.1)
racc
Expand Down Expand Up @@ -375,9 +375,9 @@ GEM
rubocop-ast (1.49.1)
parser (>= 3.3.7.2)
prism (~> 1.7)
rubocop-capybara (2.22.1)
rubocop-capybara (2.23.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop (~> 1.81)
rubocop-performance (1.26.1)
lint_roller (~> 1.1)
rubocop (>= 1.75.0, < 2.0)
Expand Down
2 changes: 1 addition & 1 deletion spec/features/cancelling_a_whole_plate_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@

click_on('Cancel Labware')

expect(find_by_id('flashes')).to have_content("Labware: #{plate_barcode} has been changed to a state of Cancelled.")
expect(find_by_id('flashes')).to have_text("Labware: #{plate_barcode} has been changed to a state of Cancelled.")
end
end
10 changes: 5 additions & 5 deletions spec/features/charge_and_pass_libraries_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
expect_work_completion_creation

fill_in_swipecard_and_barcode user_swipecard, plate_barcode
expect(find_by_id('plate-show-page')).to have_content('Passed')
expect(find_by_id('plate-show-page')).to have_text('Passed')
click_button('Charge and pass libraries')
expect(page).to have_content('Requests have been passed')
expect(page).to have_text('Requests have been passed')
end
end

Expand Down Expand Up @@ -90,10 +90,10 @@
expect_work_completion_creation

fill_in_swipecard_and_barcode user_swipecard, tube_barcode
expect(find_by_id('tube-show-page')).to have_content('Passed')
expect(find_by_id('tube-show-page')).to have_text('Passed')
click_button('Charge and pass libraries')
expect(page).to have_content('Requests have been passed')
expect(page).to have_content('Your submissions have been made and should be built shortly.')
expect(page).to have_text('Requests have been passed')
expect(page).to have_text('Your submissions have been made and should be built shortly.')
end
end
end
14 changes: 7 additions & 7 deletions spec/features/creating_a_plate_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
plate_title = find_by_id('plate-title')
expect(plate_title).to have_text('Limber Cherrypicked')
click_on('Add an empty Basic plate')
expect(page).to have_content('New empty labware added to the system.')
expect(page).to have_text('New empty labware added to the system.')
end

context 'when printing a label' do
Expand Down Expand Up @@ -134,7 +134,7 @@

before do
click_on('Add an empty Basic plate')
expect(page).to have_content('New empty labware added to the system.')
expect(page).to have_text('New empty labware added to the system.')

click_on('Print Label')
expect(PMB::PrintJob).to have_received(:new)
Expand All @@ -151,7 +151,7 @@
allow(SearchHelper).to receive(:alternative_workline_reference_name).with(child_plate).and_return(alternatives)

click_on('Add an empty Basic plate')
expect(page).to have_content('New empty labware added to the system.')
expect(page).to have_text('New empty labware added to the system.')

click_on('Print Label')
expect(PMB::PrintJob).to have_received(:new)
Expand Down Expand Up @@ -206,8 +206,8 @@
plate_title = find_by_id('plate-title')
expect(plate_title).to have_text('Limber Cherrypicked')
click_on('Add an empty Basic plate')
expect(page).to have_content('Cannot create the next piece of labware')
expect(page).to have_content('Well filter found 2 eligible requests for A1')
expect(page).to have_text('Cannot create the next piece of labware')
expect(page).to have_text('Well filter found 2 eligible requests for A1')
end
end

Expand Down Expand Up @@ -241,7 +241,7 @@
plate_title = find_by_id('plate-title')
expect(plate_title).to have_text('Limber Cherrypicked')
click_on('Add an empty Basic plate')
expect(page).to have_content('New empty labware added to the system.')
expect(page).to have_text('New empty labware added to the system.')
end
end

Expand Down Expand Up @@ -285,7 +285,7 @@
plate_title = find_by_id('plate-title')
expect(plate_title).to have_text('Limber Cherrypicked')
click_on('Add an empty Basic plate')
expect(page).to have_content('New empty labware added to the system.')
expect(page).to have_text('New empty labware added to the system.')
end
end
end
14 changes: 7 additions & 7 deletions spec/features/creating_a_tag_plate_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@
plate_title = find_by_id('plate-title')
expect(plate_title).to have_text('Limber Cherrypicked')
click_on('Add an empty Tag Purpose plate')
expect(page).to have_content('Tag plate addition')
expect(find_by_id('tag-help')).to have_content(help_text)
expect(page).to have_text('Tag plate addition')
expect(find_by_id('tag-help')).to have_text(help_text)
swipe_in('Tag plate barcode', with: tag_plate_barcode)
expect(page).to have_content(qcable_lot.lot_number)
expect(find_by_id('well_A2')).to have_content(a2_tag)
expect(page).to have_text(qcable_lot.lot_number)
expect(find_by_id('well_A2')).to have_text(a2_tag)
click_on('Create Plate')
expect(page).to have_content('New empty labware added to the system.')
expect(page).to have_text('New empty labware added to the system.')
end
end

Expand All @@ -135,10 +135,10 @@
plate_title = find_by_id('plate-title')
expect(plate_title).to have_text('Limber Cherrypicked')
click_on('Add an empty Tag Purpose plate')
expect(page).to have_content('Tag plate addition')
expect(page).to have_text('Tag plate addition')
swipe_in('Tag plate barcode', with: tag_plate_barcode)
expect(page).to have_button('Create Plate', disabled: true)
expect(page).to have_content(tag_error)
expect(page).to have_text(tag_error)
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/features/creating_plate_with_bait_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
plate_title = find_by_id('plate-title')
expect(plate_title).to have_text('example-purpose')
click_on 'Add an empty with-baits plate'
expect(page).to have_content('Carefully check the bait layout')
expect(page).to have_text('Carefully check the bait layout')
click_on 'Create plate'
# rubocop:todo Layout/LineLength
# I do not check the show page for a new plate, as it will be rendered based on my own stubs only, so it is not very informative
Expand Down
2 changes: 1 addition & 1 deletion spec/features/failing_a_whole_plate_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

click_on('Fail Labware')

expect(find_by_id('flashes')).to have_content(
expect(find_by_id('flashes')).to have_text(
"Labware: #{plate_barcode} has been changed to a state of Failed. The customer will still be charged."
)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/features/failing_quadrants_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@
click_on('Select Quadrant 4')

click_on('Fail selected wells')
expect(find_by_id('flashes')).to have_content('Selected wells have been failed')
expect(find_by_id('flashes')).to have_text('Selected wells have been failed')
end
end
2 changes: 1 addition & 1 deletion spec/features/failing_thresholds_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@
fill_in 'Molarity', with: 15
click_on('Fail selected wells')

expect(find_by_id('flashes')).to have_content('Selected wells have been failed')
expect(find_by_id('flashes')).to have_text('Selected wells have been failed')
end
end
2 changes: 1 addition & 1 deletion spec/features/failing_wells_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
end

click_on('Fail selected wells')
expect(find_by_id('flashes')).to have_content('Selected wells have been failed')
expect(find_by_id('flashes')).to have_text('Selected wells have been failed')
end
end
58 changes: 29 additions & 29 deletions spec/features/plate_transfer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,39 +85,39 @@
fill_in_swipecard(swipecard)

# if we don't do this the next step doesn't work
expect(page).to have_content('Jane Doe')
expect(page).to have_text('Jane Doe')
click_button('Robots')
click_link 'bravo LB Post Shear => LB End Prep'
expect(page).to have_content('bravo LB Post Shear => LB End Prep')
expect(page).to have_text('bravo LB Post Shear => LB End Prep')
scan_in 'Scan robot', with: '123'
within('#robot') { expect(page).to have_content('123') }
within('#robot') { expect(page).to have_text('123') }
scan_in 'Scan bed', with: '580000004838'
scan_in 'Scan plate', with: plate_barcode_1
within('#bed_list') do
expect(page).to have_no_content("Robot: #{robot_barcode}")
expect(page).to have_content("Labware: #{plate_barcode_1}")
expect(page).to have_content('Bed: 580000004838')
expect(page).to have_no_text("Robot: #{robot_barcode}")
expect(page).to have_text("Labware: #{plate_barcode_1}")
expect(page).to have_text('Bed: 580000004838')
end
scan_in 'Scan robot', with: robot_barcode
within('#robot') do
expect(page).to have_no_content('123')
expect(page).to have_content(robot_barcode.to_s)
expect(page).to have_no_text('123')
expect(page).to have_text(robot_barcode.to_s)
end
scan_in 'Scan bed', with: '580000014851'
scan_in 'Scan plate', with: plate_barcode_2
within('#bed_list') do
expect(page).to have_no_content("Robot: #{robot_barcode}")
expect(page).to have_content("Labware: #{plate_barcode_1}")
expect(page).to have_content('Bed: 580000004838')
expect(page).to have_content("Labware: #{plate_barcode_2}")
expect(page).to have_content('Bed: 580000014851')
expect(page).to have_no_text("Robot: #{robot_barcode}")
expect(page).to have_text("Labware: #{plate_barcode_1}")
expect(page).to have_text('Bed: 580000004838')
expect(page).to have_text("Labware: #{plate_barcode_2}")
expect(page).to have_text('Bed: 580000014851')
end
click_link('Validate Layout')
within '#validation_report' do
expect(page).to have_content('No problems detected!')
expect(page).to have_text('No problems detected!')
end
click_button('Start the bravo LB Post Shear => LB End Prep')
expect(page).to have_content('Robot bravo LB Post Shear => LB End Prep has been started.')
expect(page).to have_text('Robot bravo LB Post Shear => LB End Prep has been started.')
end

scenario 'informs if the robot barcode is wrong' do
Expand All @@ -126,22 +126,22 @@

fill_in_swipecard(swipecard)

expect(page).to have_content('Jane Doe')
expect(page).to have_text('Jane Doe')
click_button('Robots')
click_link 'bravo LB End Prep'
expect(page).to have_content('bravo LB End Prep')
expect(page).to have_text('bravo LB End Prep')
scan_in 'Scan robot', with: robot_barcode
within('#robot') { expect(page).to have_content(robot_barcode.to_s) }
within('#robot') { expect(page).to have_text(robot_barcode.to_s) }
scan_in 'Scan bed', with: '580000014851'
scan_in 'Scan plate', with: plate_barcode_1
within('#bed_list') do
expect(page).to have_no_content("Robot: #{robot_barcode}")
expect(page).to have_content("Labware: #{plate_barcode_1}")
expect(page).to have_content('Bed: 580000014851')
expect(page).to have_no_text("Robot: #{robot_barcode}")
expect(page).to have_text("Labware: #{plate_barcode_1}")
expect(page).to have_text('Bed: 580000014851')
end
click_link('Validate Layout')
within '#validation_report' do
expect(page).to have_content('There were problems: Your labware is not on the right robot')
expect(page).to have_text('There were problems: Your labware is not on the right robot')
end
end

Expand All @@ -151,23 +151,23 @@

fill_in_swipecard(swipecard)

expect(page).to have_content('Jane Doe')
expect(page).to have_text('Jane Doe')
click_button('Robots')
click_link 'bravo LB End Prep'
expect(page).to have_content('bravo LB End Prep')
expect(page).to have_text('bravo LB End Prep')
scan_in 'Scan robot', with: robot_barcode
within('#robot') { expect(page).to have_content(robot_barcode.to_s) }
within('#robot') { expect(page).to have_text(robot_barcode.to_s) }
scan_in 'Scan bed', with: '580000014851'
scan_in 'Scan plate', with: plate_barcode_1
within('#bed_list') do
expect(page).to have_no_content("Robot: #{robot_barcode}")
expect(page).to have_content("Labware: #{plate_barcode_1}")
expect(page).to have_content('Bed: 580000014851')
expect(page).to have_no_text("Robot: #{robot_barcode}")
expect(page).to have_text("Labware: #{plate_barcode_1}")
expect(page).to have_text('Bed: 580000014851')
end

click_link('Validate Layout')
within '#validation_report' do
expect(page).to have_content('No problems detected!')
expect(page).to have_text('No problems detected!')
end
end
end
2 changes: 1 addition & 1 deletion spec/features/pool_tubes_at_end_of_pipeline_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
scan_in('Tube barcode', with: sibling_barcode)
find_field('Tube barcode').send_keys barcode_reader_key
click_on('Make Tube')
expect(page).to have_content('New empty labware added to the system.')
expect(page).to have_text('New empty labware added to the system.')
end
end

Expand Down
6 changes: 3 additions & 3 deletions spec/features/pooling_multiple_plates_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@
expect(plate_title).to have_text('Pooled example')
click_on('Add an empty Pool Plate plate')
scan_in('Plate 1', with: plate_barcode_1)
expect(page).to have_content('DN1: A1')
expect(page).to have_no_content('DN1: A1, B1')
expect(page).to have_text('DN1: A1')
expect(page).to have_no_text('DN1: A1, B1')
scan_in('Plate 2', with: plate_barcode_2)
expect(page).to have_content('DN2: A1, B1')
expect(page).to have_text('DN2: A1, B1')
click_on('Make Pre-Cap pool Plate')
expect(page).to have_text('New empty labware added to the system')
expect(page).to have_text('Pool Plate')
Expand Down
Loading
Loading