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
2 changes: 0 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,6 @@ Rails/WhereRange: # new in 2.25
Enabled: true
Performance/MapMethodChain: # new in 1.19
Enabled: true
Capybara/ClickLinkOrButtonStyle: # new in 2.19
Enabled: true
Capybara/RSpec/MatchStyle: # new in 2.17
Enabled: true
Capybara/RedundantWithinFind: # new in 2.20
Expand Down
60 changes: 21 additions & 39 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,10 @@ GEM
airbrussh (1.6.1)
sshkit (>= 1.6.1, != 1.7.0)
ast (2.4.3)
axe-core-api (4.11.3)
axe-core-api (4.12.0)
dumb_delegator
ostruct
virtus
axe-core-rspec (4.11.3)
axe-core-api (= 4.11.3)
dumb_delegator
ostruct
virtus
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
axe-core-rspec (4.12.0)
axe-core-api (= 4.12.0)
base64 (0.3.0)
bcrypt (3.1.22)
bcrypt_pbkdf (1.1.2)
Expand Down Expand Up @@ -140,9 +131,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
cgi (0.5.1)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
cgi (0.5.2)
concurrent-ruby (1.3.7)
config (5.6.1)
deep_merge (~> 1.2, >= 1.2.1)
Expand All @@ -151,14 +140,12 @@ GEM
crack (1.0.1)
bigdecimal
rexml
crass (1.0.6)
crass (1.0.7)
date (3.5.1)
debug (1.11.1)
irb (~> 1.10)
reline (>= 0.3.8)
deep_merge (1.2.2)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
device_detector (1.1.3)
devise (5.0.4)
bcrypt (~> 3.0)
Expand Down Expand Up @@ -196,7 +183,7 @@ GEM
fugit (1.12.2)
et-orbi (~> 1.4)
raabro (~> 1.4)
globalid (1.3.0)
globalid (1.4.0)
activesupport (>= 6.1)
groupdate (6.8.0)
activesupport (>= 7.2)
Expand Down Expand Up @@ -232,7 +219,6 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.8, >= 1.8.1)
terminal-table (>= 1.5.1)
ice_nine (0.11.2)
importmap-rails (2.2.3)
actionpack (>= 6.0.0)
activesupport (>= 6.0.0)
Expand All @@ -249,7 +235,7 @@ GEM
jbuilder (2.15.1)
actionview (>= 7.0.0)
activesupport (>= 7.0.0)
json (2.19.9)
json (2.20.0)
jwt (3.2.0)
base64
kaminari (1.2.2)
Expand All @@ -266,7 +252,7 @@ GEM
kaminari-core (1.2.2)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
llhttp (0.6.1)
llhttp (0.6.2)
local_time (3.0.3)
logger (1.7.0)
loofah (2.25.1)
Expand Down Expand Up @@ -311,7 +297,7 @@ GEM
net-ssh (>= 5.0.0, < 8.0.0)
net-smtp (0.5.1)
net-protocol
net-ssh (7.3.2)
net-ssh (7.3.3)
nio4r (2.7.5)
nokogiri (1.19.4-aarch64-linux-gnu)
racc (~> 1.4)
Expand All @@ -331,7 +317,7 @@ GEM
benchmark
orm_adapter (0.5.0)
ostruct (0.6.3)
ox (2.14.27)
ox (2.14.28)
bigdecimal (>= 3.0)
paper_trail (17.0.0)
activerecord (>= 7.1)
Expand All @@ -354,9 +340,6 @@ GEM
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
psych (5.4.0)
date
stringio
public_suffix (7.0.5)
puma (8.0.2)
nio4r (~> 2.0)
Expand Down Expand Up @@ -411,9 +394,14 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.4.2)
rdoc (7.2.0)
rbs (4.0.3)
logger
prism (>= 1.6.0)
tsort
rdoc (8.0.0)
erb
psych (>= 4.0.0)
prism (>= 1.6.0)
rbs (>= 4.0.0)
tsort
redis (5.4.1)
redis-client (>= 0.22.0)
Expand Down Expand Up @@ -460,7 +448,7 @@ GEM
rubocop-ast (1.49.1)
parser (>= 3.3.7.2)
prism (~> 1.7)
rubocop-capybara (2.23.0)
rubocop-capybara (3.0.0)
lint_roller (~> 1.1)
rubocop (~> 1.81)
rubocop-factory_bot (2.28.0)
Expand All @@ -485,7 +473,7 @@ GEM
rubocop (~> 1.72, >= 1.72.1)
rubocop-rspec (~> 3.5)
ruby-progressbar (1.13.0)
rubyzip (3.4.0)
rubyzip (3.4.1)
safely_block (1.0.0)
securerandom (0.4.1)
selenium-webdriver (4.45.0)
Expand Down Expand Up @@ -523,11 +511,9 @@ GEM
ostruct
stimulus-rails (1.3.4)
railties (>= 6.0.0)
stringio (3.2.0)
terminal-table (4.0.0)
unicode-display_width (>= 1.1.1, < 4)
thor (1.5.0)
thread_safe (0.3.6)
thruster (0.1.21)
thruster (0.1.21-aarch64-linux)
thruster (0.1.21-arm64-darwin)
Expand All @@ -549,10 +535,6 @@ GEM
actionview (>= 7.1.0)
activesupport (>= 7.1.0)
concurrent-ruby (~> 1)
virtus (2.0.0)
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.3.0)
Expand All @@ -564,7 +546,7 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket (1.2.11)
websocket-driver (0.8.1)
websocket-driver (0.8.2)
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down Expand Up @@ -655,4 +637,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
4.0.14
4.0.15
4 changes: 2 additions & 2 deletions spec/features/downloaders_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

it 'displays an alert about the current access settings' do
expect(page).to have_link('Grant access')
expect(page).to have_content 'My Org has restrictions set and has not granted access to any organizations or groups.'
expect(page).to have_text 'My Org has restrictions set and has not granted access to any organizations or groups.'
end

context 'when adding a downloader' do
Expand All @@ -25,7 +25,7 @@
end

expect(page).to have_link('Revoke access')
expect(page).to have_content 'My Org has restrictions set, allowing access to specific organizations.'
expect(page).to have_text 'My Org has restrictions set, allowing access to specific organizations.'
end
end
end
4 changes: 2 additions & 2 deletions spec/features/edit_profile_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
visit '/users/edit'
fill_in 'user_password', with: '123'
click_on 'Change password'
expect(page).to have_content "Current password can't be blank"
expect(page).to have_text "Current password can't be blank"
end

it 'allows non-password changes without passwords' do
visit '/users/edit'
fill_in 'user_name', with: 'Nice Name'
click_on 'Update'
# successful update redirects to root page
expect(page).to have_content 'Your account has been updated successfully'
expect(page).to have_text 'Your account has been updated successfully'
end
end
end
18 changes: 9 additions & 9 deletions spec/features/homepage_summary_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
end

it 'displays the total number of data providers' do
expect(page).to have_content 'There is currently 1 data provider'
expect(page).to have_text 'There is currently 1 data provider'
end

it 'displays the most recent provider that uploaded data' do
expect(page).to have_content 'The most recent upload was made by Provider less than a minute ago'
expect(page).to have_text 'The most recent upload was made by Provider less than a minute ago'
end

it 'displays the total number of records and unique records in the aggregator' do
expect(page).to have_content 'POD Aggregator currently holds a total of 3 records, of which 2 are unique'
expect(page).to have_text 'POD Aggregator currently holds a total of 3 records, of which 2 are unique'
end

context 'when logged in' do
Expand All @@ -43,16 +43,16 @@
end

it 'displays the most recent time at which the org uploaded data' do
expect(page).to have_content 'Most recent upload was less than a minute ago'
expect(page).to have_text 'Most recent upload was less than a minute ago'
end

it 'displays the most recent files that the org uploaded' do
expect(page).to have_content '12345.marcxml'
expect(page).to have_content '9953670.marc'
expect(page).to have_text '12345.marcxml'
expect(page).to have_text '9953670.marc'
end

it 'displays the processing status' do
expect(page).to have_content 'No active jobs'
expect(page).to have_text 'No active jobs'
end

it 'displays the Provider home link' do
Expand All @@ -66,12 +66,12 @@
end

it 'displays info for logging in' do
expect(page).to have_content 'Already a POD user?'
expect(page).to have_text 'Already a POD user?'
expect(page).to have_link 'Login'
end

it 'displays links to docs' do
expect(page).to have_content 'Check out the POD wiki or contact pod-support@lists.stanford.edu'
expect(page).to have_text 'Check out the POD wiki or contact pod-support@lists.stanford.edu'
end
end
end
6 changes: 3 additions & 3 deletions spec/features/providers_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
it 'does not allow unprivileged user to edit, create, or destroy organizations' do
visit organizations_path

expect(page).to have_content('Aggregator')
expect(page).to have_text('Aggregator')

# don't confuse "Edit" with "Edit Profile" in header nav
expect(page).to have_no_link('Edit', exact: true)
Expand Down Expand Up @@ -52,7 +52,7 @@
describe 'Provider detail page as an unprivileged user', :js do
it 'lists some limited information about the org' do
visit organization_path(organization)
expect(page).to have_content('Aggregator')
expect(page).to have_text('Aggregator')

expect(page).to have_no_selector 'h2', text: 'Access Tokens'
expect(page).to have_no_selector 'h2', text: 'Users'
Expand All @@ -66,7 +66,7 @@
user.add_role :superadmin
visit organization_path(organization)

expect(page).to have_content '1297245.marc'
expect(page).to have_text '1297245.marc'
expect(page).to have_link 'Download'
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/features/unprivileged_user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
it 'lists some limited information about the org' do
visit organization_path(organization)

expect(page).to have_content('Best org')
expect(page).to have_text('Best org')

expect(page).to have_no_selector 'h2', text: 'Access Tokens'
expect(page).to have_no_selector 'h2', text: 'Users'
Expand Down
4 changes: 2 additions & 2 deletions spec/features/upload_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
attach_file('file', Rails.root.join('spec/fixtures/stanford-50.mrc.gz'))
click_on 'Create upload'

expect(page).to have_content 'stanford-50.mrc.gz'
expect(page).to have_content '17.8 KB application/gzip'
expect(page).to have_text 'stanford-50.mrc.gz'
expect(page).to have_text '17.8 KB application/gzip'
end
end
end