Skip to content

Commit

Permalink
Merge pull request #559 from projecthydra-labs/removing-deprecation
Browse files Browse the repository at this point in the history
Replacing browse_everything with browse_everything?
  • Loading branch information
jcoyne authored Mar 15, 2017
2 parents bbec0db + 3f25173 commit 3e1e45e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/views/hyrax/base/_form_files.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</div>

<%= render 'hyrax/uploads/js_templates' %>
<% if Hyrax.config.browse_everything %>
<% if Hyrax.config.browse_everything? %>
<h2><%= t('hyrax.base.form_files.external_upload') %></h2>
<%= render 'browse_everything', f: f %>
<% end %>
4 changes: 2 additions & 2 deletions spec/views/hyrax/base/_form.html.erb_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
let(:work) { GenericWork.new }
context 'with browse-everything disabled (default)' do
before do
allow(Hyrax.config).to receive(:browse_everything) { nil }
allow(Hyrax.config).to receive(:browse_everything?) { nil }
end
it "draws the page" do
expect(page).to have_selector("form[action='/concern/generic_works']")
Expand All @@ -44,7 +44,7 @@

context 'with browse-everything enabled' do
before do
allow(Hyrax.config).to receive(:browse_everything) { 'not nil' }
allow(Hyrax.config).to receive(:browse_everything?) { 'not nil' }
end
it 'renders the BE upload widget' do
expect(page).to have_selector('button#browse-btn')
Expand Down

0 comments on commit 3e1e45e

Please sign in to comment.