Skip to content

Commit

Permalink
Merge pull request #282 from enoodle/fix_camp_show_missing_at
Browse files Browse the repository at this point in the history
fixing missing @ and improving camp testing
  • Loading branch information
enoodle authored Mar 11, 2018
2 parents e28be0e + 06e282d commit e386164
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/views/camps/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<% if @camp.about_the_artist.present? %>
<div class="camp-description">
<b><%=t :form_about_the_artist_label %></b>
<%= simple_format(Rinku.auto_link(camp.about_the_artist), class: "auto-#{@detector.direction(@camp.about_the_artist)}" ) %>
<%= simple_format(Rinku.auto_link(@camp.about_the_artist), class: "auto-#{@detector.direction(@camp.about_the_artist)}" ) %>
</div>
<% end %>

Expand Down
6 changes: 6 additions & 0 deletions spec/controllers/camps_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
nature: 'Well - it will burn....',
contact_email: '[email protected]',
contact_name: camp_leader,
about_the_artist: 'about them',
plan: 'camp plan',
moop: 'moop plan',
recycling: 'recycling plan',
budgetplan: 'budgetplan plan',
cocreation: 'cocreation plan',
people_attributes: {'0' => {name: Faker::Name.name}}
}
}
Expand Down

0 comments on commit e386164

Please sign in to comment.