Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SJ - Fixing Bootstrap Specs #2050

Merged
merged 5 commits into from
Nov 5, 2019
Merged

SJ - Fixing Bootstrap Specs #2050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b06899f
testing fix
Stuart-Johnson Oct 30, 2019
c08903d
fix for authorized user specs
Stuart-Johnson Oct 30, 2019
3b72c0c
Merge branch 'v3.6.0' into sj-fixing_bootstrap_specs
Oct 31, 2019
87aa942
Merge branch 'v3.6.0' into sj-fixing_bootstrap_specs
Oct 31, 2019
32285e6
Merge branch 'v3.6.0' into sj-fixing_bootstrap_specs
Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
//= require surveyor/responses
//= require surveyor/surveys

// require batch-select
// require bootstrap-table
// require bootstrap-table-export
// require tableExport
Expand Down
9 changes: 9 additions & 0 deletions spec/features/dashboard/authorized_users/user_deletes_authorized_user_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
end

it 'should delete the user' do
first('#authorizedUsers button[name="refresh"]').click
wait_for_javascript_to_finish

first('.delete-authorized-user:not(.disabled)').click
confirm_swal
wait_for_javascript_to_finish
Expand All @@ -62,6 +65,9 @@
end

it 'should delete the user and refresh page contents to reflect their updated rights' do
first('#authorizedUsers button[name="refresh"]').click
wait_for_javascript_to_finish

all('.delete-authorized-user:not(.disabled)').last.click
confirm_swal
wait_for_javascript_to_finish
Expand All @@ -84,6 +90,9 @@
end

it 'should redirect to the dashboard landing page' do
first('#authorizedUsers button[name="refresh"]').click
wait_for_javascript_to_finish

all('.delete-authorized-user:not(.disabled)').last.click
confirm_swal
wait_for_javascript_to_finish
Expand Down
6 changes: 6 additions & 0 deletions spec/features/proper/protocol/authorized_users/user_deletes_authorized_user_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
end

it 'should delete the user' do
first('#authorizedUsers button[name="refresh"]').click
wait_for_javascript_to_finish

first('.delete-authorized-user:not(.disabled)').click
confirm_swal
wait_for_javascript_to_finish
Expand All @@ -63,6 +66,9 @@
end

it 'should redirect to the dashboard landing page' do
first('#authorizedUsers button[name="refresh"]').click
wait_for_javascript_to_finish

first('.delete-authorized-user:not(.disabled)').click
confirm_swal
wait_for_javascript_to_finish
Expand Down