Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' into forms

  • Loading branch information...
commit 3bcae9b8a68690d1dffd369bd72e94d764590a28 2 parents 01aa3ae + c3c4f4a
Philip Arndt authored November 30, 2011
1  ...lib/generators/refinery/engine/templates/app/views/refinery/plural_name/admin/plural_name/_form.html.erb
@@ -43,7 +43,6 @@
43 43
           </div>
44 44
         <%% end %>
45 45
       </div>
46  
-    </div>
47 46
 <% generated_text_areas = true -%>
48 47
 <% elsif attribute.field_type.to_s != 'text_area' -%>
49 48
     <%%= 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 %>  -%>
2  core/lib/generators/refinery/engine/templates/spec/requests/refinery/admin/plural_name_spec.rb
@@ -68,7 +68,7 @@
68 68
           visit refinery_admin_<%= plural_name %>_path
69 69
 
70 70
           within ".actions" do
71  
-            click_link "Edit this <%= singular_name %>"
  71
+            click_link "Edit this <%= singular_name.titleize.downcase %>"
72 72
           end
73 73
 
74 74
           fill_in "<%= title.name.titleize %>", :with => "A different <%= title.name %>"
2  testing/lib/refinery/tasks/testing.rake
@@ -38,7 +38,7 @@ namespace :refinery do
38 38
 
39 39
     desc "Remove the dummy app used for testing"
40 40
     task :clean_dummy_app do
41  
-      system "rm -Rdf #{File.join(Refinery::Testing::Railtie.target_engine_path, 'spec/dummy')}"
  41
+      FileUtils.rm_rf File.join(Refinery::Testing::Railtie.target_engine_path, 'spec/dummy')
42 42
     end
43 43
 
44 44
     namespace :engine do

0 notes on commit 3bcae9b

Please sign in to comment.
Something went wrong with that request. Please try again.