hot-glue 0.2.4 → 0.3.5

data/lib/generators/hot_glue/templates/erb/_list.erb

@@ -1,19 +1,35 @@
-<\%= turbo_frame_tag "<%= plural %>-list" do %>
-  <div class="container-fluid "><%= singular %>-table
-    <div class="row">
+<\%= turbo_frame_tag "<%= plural %>-list" <%= nested_for_turbo_id_list_constructor %>  do %>
+  <div class="<%= @container_name %> scaffold-list">
+    <% unless @nested_args.any? %><h4><%= plural.gsub("_", " ").upcase %></h4><% end %>
+
+    <% unless @no_create %><%= '<%= render partial: "' + ((@namespace+"/" if @namespace) || "") +  plural + '/new_button", locals: {' + nested_assignments + '}' + '%\>'.gsub('\\',"")  %><% end %>
+
+    <div class="row scaffold-row">
       <%= list_column_headings %>
-      <div class='col buttons-col'></div>
+      <% if @downnest_children.any? %>
+        <% each_downnest_width = @downnest_children.count == 1 ? 40 : (60/@downnest_children.count).floor %>
+      <% @downnest_children.each do |downnest| %>
+        <div class="col scaffold-col-heading" style="flex-basis: <%= each_downnest_width %>%;">
+          <h4>
+            <%=  downnest.titleize  %>
+          </h4>
+        </div>
+      <% end %>
+      <% end %>
+
+      <div class='col scaffold-col-heading scaffold-col-heading-buttons' style="flex-basis: 150px"></div>
     </div>
 
       <\% if <%= plural %>.empty? %>
-        <div>
-            None
-        </div>
+    <div>
+        None
+    </div>
       <\% end %>
       <\% <%= plural %>.each do |<%= singular %>| %>
-        <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %> <%= nested_assignments_with_leading_comma %> } %>
+        <\%= render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %><%= nested_assignments_with_leading_comma if  @nestable %><%= ", nested_for: nested_for" if @nestable %> } %>
       <\% end %>
 
     <%=  @no_paginate ? "" : paginate %>
+    </div>
   </div>
 <\% end %>

data/lib/generators/hot_glue/templates/erb/_show.erb

@@ -1,8 +1,28 @@
 <%= all_line_fields %>
-<div class="col">
+
+<% if @downnest_children.any? %>
+  <% each_downnest_width = @downnest_children.count == 1 ? 33 : (53/@downnest_children.count).floor %>
+  <% @downnest_children.each do |downnest| %>
+  <div class="<%= @col_identifier %> scaffold-downnest" style="flex-basis: <%= each_downnest_width %>%" >
+  <\%= render partial: "<%= namespace_with_trailing_dash %><%= downnest %>/list", locals: {
+    nested_for: "<% if @nested_args.any? %>#{nested_for + "__" if nested_for}<% end %><%= @singular %>-#{<%= @singular %>.id}",
+    <%= @singular %>: <%= @singular %><%= nest_assignments_operator(false, true) %>,
+    <%= downnest %>: <%= @singular %>.<%= downnest %>} %>
+  </div>
+  <% end %>
+<% end %>
+
+<div class="<%= @col_identifier %> scaffold-line-buttons" style="flex-basis: 150px;">
   <% if destroy_action %>
-    <\%= button_to "Delete".html_safe, <%= path_helper_singular %>(<%= path_helper_args %>), method: :delete, data: <%= delete_confirmation_syntax  %>,  disable_with: "Loading...", class: "delete-<%= singular %>-button btn btn-primary " %>
+    <\%= form_with url: <%= path_helper_singular %>(<%= path_helper_args %>), html: {style: "display: inline-block;"}, method: :delete do |f| %>
+      <\%= f.submit "Delete".html_safe, data: <%= delete_confirmation_syntax  %>, class: "delete-<%= singular %>-button btn btn-primary btn-sm" %>
+    <\% end %>
+  <% end %>
+
+
+  <%= magic_button_output %>
+
+  <% unless @no_edit %>
+  <\%= link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_singular %>(<%= path_helper_args %>), <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary btn-sm" %>
   <% end %>
-  &nbsp;
-  <\%= link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_singular %>(<%= path_helper_args %>), <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary " %>
 </div>

data/lib/generators/hot_glue/templates/erb/create.turbo_stream.erb

@@ -1,13 +1,13 @@
 <\% if @<%= singular %>.errors.none? %>
-  <\%= turbo_stream.replace "<%= plural %>-list" do %>
-  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %>} %>
+  <\%= turbo_stream.replace "<%= plural %>-list<%= nested_for_turbo_nested_constructor %>" do %>
+  <\%= render partial: "list", locals: {<%= plural %>: @<%= plural %><%= nested_for_assignments_constructor %><%= nest_assignments_operator(true, true) %>} %>
   <\% end %>
   <\% end %>
   <\%= turbo_stream.replace "<%= singular %>-new" do %>
   <\% if @<%= singular %>.errors.none? %>
-  <\%= render partial: "new_button" %>
+  <\%= render partial: "new_button", locals: {<%= nest_assignments_operator(true, false) %>} %>
   <\% else %>
-  <\%= render partial: "new_form", locals: {<%= singular %>: @<%= singular %>} %>
+  <\%= render partial: "new_form", locals: {<%= singular %>: @<%= singular %> <%= nest_assignments_operator(true, true) %> } %>
   <\% end %>
   <\% end %>
   <\%= turbo_stream.replace "flash_notices" do %>

data/lib/generators/hot_glue/templates/erb/destroy.turbo_stream.erb

@@ -1,3 +1,3 @@
-<\%= turbo_stream.replace "<%=plural%>-list" do %>
-  <\%= render partial: "list", locals: {<%=plural%>: @<%=plural%>}  %>
+<\%= turbo_stream.replace "<%= plural %>-list<%= nested_for_turbo_nested_constructor %>" do %>
+  <\%= render partial: "list", locals: {<%=plural%>: @<%=plural%> <%= nested_for_assignments_constructor %> <%= nest_assignments_operator(true, true) %>}  %>
 <\% end %>

data/lib/generators/hot_glue/templates/erb/edit.erb

@@ -5,24 +5,14 @@
   <div class="cell editable" style="position: relative;">
 
     <\% if @<%= singular %>.errors.any? %>
-      <\%= render(partial: "#{controller.namespace}errors", locals: {resource: @<%= singular%> }) %>
+      <\%= render(partial: "<%= namespace_with_trailing_dash %>errors", locals: {resource: @<%= singular %> }) %>
     <\% end %>
 
-    <h2>Editing</h2>
-    <% if eval("@" + singular).try(:to_label) %>
-    <%="@" + singular%>.to_label
-    <%  elsif eval("@" + singular).try(:name)  %>
-   <%="@" + singular%>.name %>
-    <% else %>
-    (no name)
-      <% end %>
+    <h2>Editing <\%= @<%= @singular %>.<%= display_class %> %></h2>
     <\%= form_with model: <%= "@" + singular%>, url: <%= path_helper_singular %>(<%= path_arity %>) do |f| %>
     <\%=  render partial: "form",  locals: {:<%=  singular  %> => <%= "@" + singular%>, f: f} %>
     <\% end %>
-    <i class='fa fa-times-circle fa-2x'
-       data-name='close-<%=  singular  %>__<\% <%= "@" + singular %>.id %> }'
-       data-row-id=<%= "@" + singular %>.id,
-       data-role='close-button'></i>
+
   </div>
 
 <\% end %>

data/lib/generators/hot_glue/templates/erb/index.erb

@@ -1,10 +1,12 @@
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-md-12">
-      <\%= render partial: "new_button" %>
-      <div class="clearfix"></div>
-      <\%= render partial: '<%= list_path_partial %>',
-              locals: {<%=  plural %>: @<%= plural %>} \%>
-    </div>
-  </div>
+<div class="<%= @container_name %>">
+  <% if @layout == "bootstrap" %><div class="row"> <div class="col-md-12">
+  <% else %>
+    <div class=' scaffold-index-<%= plural %>'>
+  <% end %>
+
+  <div class="clearfix"></div>
+  <\%= render partial: '<%= list_path_partial %>',
+  locals: {<%= plural %>: @<%= plural %><%= nested_for_assignments_constructor %><%= nest_assignments_operator(true, true) if @nestable %> } \%>
+
+  <% if @layout == "bootstrap" %></div></div><% else  %></div><% end %>
 </div>

data/lib/generators/hot_glue/templates/erb/update.turbo_stream.erb

@@ -1,6 +1,9 @@
-<\%= turbo_stream.replace "<%= singular%>__#{@<%= singular %>.id}" do %>
-  <\%= render partial: 'line', locals: {<%= singular %>: @<%= singular %> <%= nested_assignments_with_leading_comma %> } %>
+<% if !@display_list_after_update %><\%= turbo_stream.replace "<%= singular%>__#{@<%= singular %>.id}" do %>
+  <\%= render partial: 'line', locals: {<%= singular %>: @<%= singular %> <%= nest_assignments_operator(true,true) %> } %>
+<\% end %><% else %><\%= turbo_stream.replace "<%= plural %>-list" do %>
+  <\%= render partial: '<%= list_path_partial %>', locals: {<%= plural %>: @<%= plural %><%= nest_assignments_operator(true, true) if @nestable %><%= nested_for_assignments_constructor %> } \%>
 <\% end %>
+<% end %>
 
 <\%= turbo_stream.replace "flash_notices" do %>
   <\%= render partial: "layouts/flash_notices" %>

data/lib/generators/hot_glue/templates/haml/_line.haml

@@ -1,6 +1,6 @@
 = turbo_frame_tag "<%= singular %>__#{<%= singular %>.id}" do
   .row{'data-id': <%= singular %>.id, 'data-edit': 'false'}
-    = render partial: "<%= show_path_partial %>", locals: {<%= singular %>: <%= singular %>}
+    = render partial: "<%= show_path_partial %>", locals: {<%= singular %>: <%= singular %> <%= nest_assignments_operator(false, true) %>}
 
 
 

data/lib/generators/hot_glue/templates/haml/_list.haml

@@ -1,5 +1,9 @@
 = turbo_frame_tag "<%= plural %>-list" do
-  .container-fluid.<%= singular %>-table
+  %div{class: "<%= @container_name %> <%= singular %>-table"}
+    .row
+      .col-md-12
+        <%= '= render partial: "' + (@namespace+"/" if @namespace) +  plural + '/new_button", locals: {'  + nested_assignments + '}'  unless @no_create %>
+
     .row
 <%= list_column_headings %>
       .col
@@ -7,5 +11,5 @@
       - if <%= plural %>.empty?
         None
       - <%= plural %>.each do |<%= singular %>|
-        = render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %> <%= nested_assignments_with_leading_comma %> }
+        = render partial: '<%= line_path_partial %>', locals: {<%= singular %>: <%= singular %><%= nested_assignments_with_leading_comma if @nest %> }
     <%=  @no_paginate ? "" : paginate %>

data/lib/generators/hot_glue/templates/haml/create.turbo_stream.haml

@@ -1,12 +1,12 @@
 - if @<%= singular %>.errors.none?
   = turbo_stream.replace "<%= plural %>-list" do
-    = render partial: "list", locals: {<%= plural %>: @<%= plural %>}
+    = render partial: "list", locals: {<%= plural %>: @<%= plural %> <%= nest_assignments_operator(true, true) %>}
 
 = turbo_stream.replace "<%= singular %>-new" do
   - if @<%= singular %>.errors.none?
-    = render partial: "new_button"
+    = render partial: "new_button", locals: {<%= nest_assignments_operator(true, false) %> }
   - else
-    = render partial: "new_form", locals: {<%= singular %>: @<%= singular %>}
+    = render partial: "new_form", locals: {<%= singular %>: @<%= singular %> <%= nest_assignments_operator(true, true) %>}
 
 = turbo_stream.replace "flash_notices" do
   = render partial: "layouts/flash_notices"

data/lib/generators/hot_glue/templates/haml/destroy.turbo_stream.haml

@@ -1,2 +1,2 @@
 = turbo_stream.replace "<%=plural%>-list" do
-  = render partial: "list", locals: {<%=plural%>: @<%=plural%>}
+  = render partial: "list", locals: {<%=plural%>: @<%=plural%> <%= nest_assignments_operator(true, true) %>}

data/lib/generators/hot_glue/templates/haml/edit.haml

@@ -17,5 +17,3 @@
     = form_with model: <%= "@" + singular%>, url: <%= path_helper_singular %>(<%= path_arity %>) do |f|
       = render partial: "form",  locals: {:<%=  singular  %> => <%= "@" + singular%>, f: f}
 
-    %i.fa.fa-times-circle.fa-2x{ 'data-name' =>  'close-invoice__#{@invoice.id}', 'data-row-id' =>  <%= "@" + singular %>.id, 'data-role' =>  'close-button'}
-

data/lib/generators/hot_glue/templates/haml/index.haml

@@ -1,9 +1,8 @@
-.container-fluid
+%div{class: "#{@container_name }"}
   .row
     .col-md-12
-      = render partial: "new_button"
       .clearfix
-      = render partial: "<%= list_path_partial %>", locals: {<%= plural %>: @<%= plural %>}
+      = render partial: "<%= list_path_partial %>", locals: {<%= plural %>: @<%= plural %> <%= nest_assignments_operator(true, true) %>}
 
 
 

data/lib/generators/hot_glue/templates/system_spec.rb.erb

@@ -2,46 +2,77 @@ require 'rails_helper'
 
 describe "interaction for <%= controller_class_name %>", type: :feature do
   include HotGlue::ControllerHelper
-  <% unless @auth.nil? %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
-
-  let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
-  let!(:<%= singular %>2) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
-  let!(:<%= singular %>3) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
-
-  <%= objest_nest_factory_setup %>
-
+  <% unless @god %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
+    <%= @columns.map { |col|
+      type = eval("#{singular_class}.columns_hash['#{col}']").type
+      case type
+      when :integer
+        if col.to_s.ends_with?("_id")
+          assoc = "#{col.to_s.gsub('_id','')}"
+          "let!(:#{assoc}1) {create(:#{assoc}, name: FFaker::Name.name)}"
+        end
+      else
+      end
+    }.compact.join("\n")
+          %>
+  <% item1_addOns = ""
+   if (eval(@singular_class).instance_methods.include?(display_class.to_s))
+    item1_addOns << "#{display_class}: FFaker::Name.name"
+   end
+
+  item1_addOns << ", " + @columns.map { |col|
+  type = eval("#{singular_class}.columns_hash['#{col}']").type
+  case type
+  when :string
+    "#{col}: FFaker::Movie.title"
+  when :text
+    "#{col}:  FFaker::Lorem.paragraphs(10).join("  ")"
+
+  when :float
+    "#{col}: rand(1)*10000"
+  when :boolean
+    "#{col}: !!rand(2).floor"
+  when :time
+    "#{col}: Time.current + rand(5000).seconds"
+  when :date
+    "#{col}: Date.current + rand(50).days"
+  when :datetime
+    "#{col}: DateTime.current + rand(1000).seconds"
+  when :integer
+    if col.to_s.ends_with?("_id")
+      # shoould the assoication be on here
+    else
+     "#{col}: rand(100)"
+    end
+  end
+}.compact.join(", \n      ")
+  %>let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> <%= item1_addOns %> )}
+  <%= objest_nest_factory_setup %> <% unless @god %>
   before(:each) do
     login_as(<%= @auth %>)
-  end
+  end <% end %>
 
   describe "index" do
     it "should show me the list" do
       visit <%= path_helper_plural %>
-
 <%=
 @columns.map { |col|
   type = eval("#{singular_class}.columns_hash['#{col}']").type
-  # limit = eval("#{singular_class}.columns_hash['#{col}']").limit
-  # sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
-  #
-
   case type
   when :datetime
-    "      " + ["expect(page).to have_content(#{singular}#{rand(3)+1}.#{col}.in_time_zone(#{ @auth }.timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(#{ @auth }.timezone)  )"].join("\n      ")
-
-  else
-    "      " + ["expect(page).to have_content(#{singular}#{rand(3)+1}.#{col})"].join("\n      ")
-
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(current_timezone)  )"].join("\n      ")
+  when :integer
+    if !col.ends_with?("_id")
+      "      " + ["expect(page).to have_content(#{singular}#{1}.#{col})"].join("\n      ")
+    end
   end
 
 }.join("\n")
-     
       %>
-
     end
   end
 
-  describe "new & create" do
+<% unless @no_create %>  describe "new & create" do
     it "should create a new <%= singular.titlecase %>" do
       visit <%= path_helper_plural %>
       click_link "New <%= singular.titlecase %>"
@@ -50,17 +81,34 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 <%=
   @columns.map { |col|
     type = eval("#{singular_class}.columns_hash['#{col}']").type
-    # limit = eval("#{singular_class}.columns_hash['#{col}']").limit
-    # sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
-    #
-
     case type
     when :datetime
+      "      " + "new_#{col} = DateTime.current + (rand(100).days) \n" +
+      '      ' + "find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
     when :integer
-      "      " + 'find("input#' + singular + '_' + col.to_s + '").fill_in(with: rand(10))'
+
+      if col.to_s.ends_with?("_id")
+        assoc = col.to_s.gsub('_id','')
+        "      #{col}_selector = find(\"[name='#{singular}[#{col}]']\").click \n" +
+        "      #{col}_selector.first('option', text: #{assoc}1.name).select_option"
+      else
+        "      new_#{col} = rand(10) \n" +
+        "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
+      end
+
+    when :enum
+        "      list_of_#{col.to_s} = #{singular_class}.defined_enums['#{col.to_s}'].keys \n" +
+        "      " + "new_#{col.to_s} = list_of_#{col.to_s}[rand(list_of_#{col.to_s}.length)].to_s \n" +
+        '      find("select[name=\'' + singular + '[' + col.to_s + ']\']  option[value=\'#{new_' + col.to_s + '}\']").select_option'
+
+    when :boolean
+      "     new_#{col} = rand(2).floor \n" +
+      "     find(\"[name='#{singular}[#{col}]'][value='\#{new_" + col.to_s + "}']\").choose"
     else
       "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
-      '      ' + 'find("input#' + singular + '_' + col.to_s + '").fill_in(with: new_' + col.to_s + ')'
+      "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
     end
 
   }.join("\n")
@@ -75,41 +123,82 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 
     case type
     when :datetime
+         "      expect(page).to have_content(new_#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y')  + \" @ \" +
+      new_#{col}.in_time_zone(current_timezone).strftime('%l').strip + \":\" +
+      new_#{col}.in_time_zone(current_timezone).strftime('%M %p').strip + \" \" +
+      timezonize(current_timezone))"
     when :integer
+      if col.to_s.ends_with?("_id")
+        # shoould the assoication be on here
+      else
+         "expect(page).to have_content(new_#{col})"
+      end
     else
       "expect(page).to have_content(new_#{col})"
     end
 
-  }.join("\n")
+  }.compact.join("\n      ")
   %>
 
     end
-  end
+  end<% end %>
 
-  describe "show" do
-    it "should return a view form" do
-      visit <%= path_helper_plural %>
-
-    end
-  end
 
   describe "edit & update" do
     it "should return an editable form" do
       visit <%= path_helper_plural %>
       find("a.edit-<%= singular %>-button[href='/<%= namespace_with_slash %><%= plural %>/#{<%= singular %>1.id}/edit']").click
 
-      expect(page).to have_content("Editing #{<%= singular %>.<%= "abc" %>}")
+      expect(page).to have_content("Editing #{<%= singular %>1.<%= @display_class  %> || "(no name)"}")
 <%=
     @columns.map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
-
+      limit = eval("#{singular_class}.columns_hash['#{col}']").limit
+      sql_type =  eval("#{singular_class}.columns_hash['#{col}']").sql_type
       case type
       when :datetime
       when :integer
-      else
-        "      " + "new_#{col.to_s} = Faker::Name.new \n" +
+        if !col.to_s.ends_with?("_id")
+            "     new_#{col} = rand(10000).floor \n" +
+            "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s})"
+        end
+      when :text
+        if sql_type == "text"
+            "      " + "new_#{col.to_s} = FFaker::Lorem.paragraphs(3).join \n" +
+            '      find("textarea[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+
+        else # unreachable?
+            "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
+            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+        end
+      when :string
+        if sql_type == "varchar"
+            "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
+            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+        else
+            "      " + "new_#{col.to_s} = FFaker::Lorem.paragraphs(1).join \n" +
+            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+        end
+      when :boolean
+          "     new_#{col} = rand(2).floor \n" +
+          "     find(\"[name='#{singular}[#{col}]'][value='\#{new_#{col}}']\").choose"
+      when :float
+        "     new_#{col} = rand(1)*5000 \n" +
+        "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
+      when :date
+        "     new_#{col} = Date.current + rand(100).days \n" +
+        "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
+      when :time
+        "     new_#{col} = Time.current + rand(144).hours \n" +
+        "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
+      when :enum
+        "      list_of_#{col.to_s} = #{singular_class}.defined_enums['#{col.to_s}'].keys \n" +
+        "      " + "new_#{col.to_s} = list_of_#{col.to_s}[rand(list_of_#{col.to_s}.length)].to_s \n" +
+        '      find("select[name=\'' + singular + '[' + col.to_s + ']\']  option[value=\'#{new_' + col.to_s + '}\']").select_option'
 
-        '      find("input[name=\'' + singular + '[' + col.to_s + ']\'").fill_in(with: new_' + col.to_s + ')'
+      else
+        "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
+        '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
 
       end
     }.join("\n")
@@ -123,26 +212,36 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       type = eval("#{singular_class}.columns_hash['#{col}']").type
       case type
       when :datetime
-      when :integer
+        # TODO: implement me
+      when :time
+        # TODO: implement me
+      when :date
+        # TODO: implement me
+      when :boolean
+        # TODO: implement me
       else
+        unless type==:integer && col.to_s.ends_with?("_id")
         '        expect(page).to have_content(new_' + col.to_s + ')'
+        end
       end
-    }.join("\n")
+    }.compact.join("\n")
     %>
 
       end
     end
   end
 
-  describe "destroy" do
+<% unless @no_delete %>  describe "destroy" do
     it "should destroy" do
       visit <%= path_helper_plural %>
       accept_alert do
-        find("a.delete-<%= singular %>-button[href='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}']").click
+        find("form[action='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}'] > input.delete-<%= singular %>-button").click
       end
-      expect(page).to_not have_content(<%= singular %>1.email)
+#      find("form[action='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}'] > input.delete-<%= singular %>-button").click
+
+      expect(page).to_not have_content(<%= singular %>1.<%= @display_class %>)
       expect(<%= singular_class %>.where(id: <%= singular %>1.id).count).to eq(0)
     end
-  end
+  end<% end %>
 end