Skip to content

Commit

Permalink
Merge branch 'master' into remove_skydrive
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne committed Jul 6, 2017
2 parents cef1613 + 717d919 commit 76635d9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Gemfile
Expand Up @@ -38,3 +38,7 @@ else
end
end
# END ENGINE_CART BLOCK

unless File.exist?(file)
eval_gemfile File.expand_path('spec/test_app_templates/Gemfile.extra', File.dirname(__FILE__))
end
2 changes: 1 addition & 1 deletion app/views/browse_everything/_file.html.erb
Expand Up @@ -12,7 +12,7 @@
data-tt-parent-id="<%=parent%>"
data-tt-branch="<%=file.container? ? 'true' : 'false'%>">

<td role="gridcell" class="<%=file.container? ? 'ev-container' : 'ev-file'%> ev-file-name">
<td role="gridcell" title="<%= file.name %>" class="<%=file.container? ? 'ev-container' : 'ev-file'%> ev-file-name">
<% if disabled %>
<span title="<%= t('browse_everything.size_disabled', max_size: number_to_human_size(max_size)) %>"
class="<%=file.container? ? 'folder' : 'file'%>" aria-hidden="true">
Expand Down
1 change: 1 addition & 0 deletions spec/test_app_templates/Gemfile.extra
@@ -0,0 +1 @@
gem 'jquery-rails'
5 changes: 4 additions & 1 deletion spec/test_app_templates/lib/generators/test_app_generator.rb
Expand Up @@ -17,7 +17,10 @@ def inject_css

def inject_javascript
insert_into_file 'app/assets/javascripts/application.js', after: '//= require_tree .' do
"\n//= require browse_everything"
%(
//= require jquery
//= require browse_everything
)
end
end

Expand Down
4 changes: 4 additions & 0 deletions spec/views/browse_everything/_file.html.erb_spec.rb
Expand Up @@ -33,6 +33,10 @@
it 'draws link' do
expect(page).to have_selector('a.ev-link')
end

it 'provides hover text' do
expect(page.find('td.ev-file')['title']).to eq(file.name)
end
end

context 'max not configured' do
Expand Down

0 comments on commit 76635d9

Please sign in to comment.