Permalink
Browse files

Merge branch 'master' into forms

  • Loading branch information...
2 parents 01aa3ae + c3c4f4a commit 3bcae9b8a68690d1dffd369bd72e94d764590a28 @parndt parndt committed Nov 30, 2011
@@ -43,7 +43,6 @@
</div>
<%% end %>
</div>
- </div>
<% generated_text_areas = true -%>
<% elsif attribute.field_type.to_s != 'text_area' -%>
<%%= f.<%= attribute.field_type -%> :<%= attribute.name -%><%= ", :class => 'larger widest'" if (index == 0 && attribute.field_type == :text_field) -%><%= ", :checked => @#{singular_name}[:#{attribute.name}]" if attribute.field_type == :check_box %> -%>
@@ -68,7 +68,7 @@
visit refinery_admin_<%= plural_name %>_path
within ".actions" do
- click_link "Edit this <%= singular_name %>"
+ click_link "Edit this <%= singular_name.titleize.downcase %>"
end
fill_in "<%= title.name.titleize %>", :with => "A different <%= title.name %>"
@@ -38,7 +38,7 @@ namespace :refinery do
desc "Remove the dummy app used for testing"
task :clean_dummy_app do
- system "rm -Rdf #{File.join(Refinery::Testing::Railtie.target_engine_path, 'spec/dummy')}"
+ FileUtils.rm_rf File.join(Refinery::Testing::Railtie.target_engine_path, 'spec/dummy')
end
namespace :engine do

0 comments on commit 3bcae9b

Please sign in to comment.