starting update all cucumber scenario compatibility. too much change …

…to report it

app/controllers/tickets_controller.rb

@@ -61,7 +61,7 @@ def update_main_description
   #
   def create
     @ticket = Ticket.new_by_params(params[:ticket], @project, current_user)
-    if params[:submit] == 'Preview'
+    if params[:commit] == 'Preview'
       @preview = true
       @ticket_new = true
       render :new
@@ -80,11 +80,11 @@ def create
   def update
     return return_404 unless @ticket
     @ticket_change = @ticket.dup
-    if params[:submit] != 'Preview' &&
+    if params[:commit] != 'Preview' &&
       @ticket.generate_update(params[:ticket], current_user)
       redirect_to project_ticket_url(@project, @ticket)
     else
-      if params[:submit] == 'Preview'
+      if params[:commit] == 'Preview'
         @preview_description = params[:ticket][:description]
       else
         flash[:error] = 'No new update added'

app/models/ticket.rb

@@ -226,7 +226,7 @@ def milestone_in_same_project
   end
 
   def users_in_members
-    return true unless user_assigned_id
+    return true if user_assigned_id.blank?
     project.has_member?(user_assigned)
   end
 

app/views/admin/functions/index.html.haml

@@ -4,9 +4,9 @@
 
   .inner
     .flash
-      = message
+      = flash
 
-    = form :action => resource(:admin, :functions, :update_all), :method => 'PUT', :class => 'form' do
+    - form_tag update_all_admin_functions_url, :method => 'PUT', :class => 'form' do
       %table.table
         %thead
           %tr
@@ -16,10 +16,10 @@
           - for function in @functions
             %tr
               %td= function.name
-              %td=check_box :name => "project_admin[#{function.id}]", :boolean => true, :checked => function.project_admin
+              %td= check_box_tag "project_admin[#{function.id}]", 1, function.project_admin?
       .actions-bar
         .actions
-          =link_to 'Add function', resource(:admin, :functions, :new)
-          =submit "Update all functions", :class=> 'button'
+          =link_to 'Add function', new_admin_function_url
+          = submit_tag "Update all functions", :class=> 'button'
         .clear
 

app/views/admin/functions/new.html.haml

@@ -3,17 +3,17 @@
 
   .inner
     .flash
-      = error_messages_for @function
+      = error_messages_for :function
 
 
-    = form_for(@function, :action => resource(:admin, :functions), :class => 'form') do
+    - form_for([:admin, @function], :html => {:class => 'form'}) do |f|
       .group
         %label.label{:for => 'function[name]'} Name
-        = text_field :name, :class => 'text_field'
+        = f.text_field :name, :class => 'text_field'
       .group
         %label.checkbox{:for => 'function[project_admin]'} Project admin?
-        = check_box :name => "function[project_admin]", :value => true, :checked => @function.project_admin, :class => 'checkbox'
+        = f.check_box :project_admin, :class => 'checkbox'
       %div{:class => 'group navform'}
-        = submit "Create", :class => 'button'
+        = submit_tag "Create", :class => 'button'
         or
-        = link_to 'Back', resource(:admin, :functions)
+        = link_to 'Back', admin_functions_url

app/views/layouts/application.html.haml

@@ -33,9 +33,9 @@
               - if admin? @project
                 %li{:class => settings_current}= link_to 'Settings', project_project_members_url(@project)
           .clear
-        - if flash[:notice]
-          .notice
-            %p.notice{:class => 'flash'}= flash[:notice]
+        - flash.keys.each do |k|
+          %div{:class => k}
+            %p{:class => "flash #{k}"}= flash[k]
     #wrapper
       #main
         .block

app/views/sessions/new.html.erb

@@ -34,7 +34,7 @@
         </div>
         <div class="group navform">
           <div class="right">
-            <%= submit_tag 'Submit', :class => 'button' %>
+            <%= submit_tag 'Log In', :class => 'button' %>
             |
             <%= link_to 'register', new_user_url %>
             <%- if devise_mapping.recoverable? %>

app/views/tickets/new.html.haml

@@ -14,7 +14,7 @@
         = flash[:error]
         = error_messages_for :ticket
 
-      - form_for([@project, @ticket], :id => 'ticket_form' , :class => 'form') do |f|
+      - form_for([@project, @ticket], :html => {:id => 'ticket_form' , :class => 'form'}) do |f|
         .columns
           %div{:class => 'column left'}
             .group

app/views/tickets/show.html.haml

@@ -51,7 +51,7 @@
 
         #ticket_update_form
           %h3 Update this ticket
-          - form_for([@project, @ticket], :class => 'form') do |f|
+          - form_for([@project, @ticket_change], :html => {:class => 'form'}) do |f|
             .columns
               %div{:class => 'column left'}
                 -# TODO: extract this node in partial with same part in tickets/new

autotest/discover.rb

@@ -1,2 +1,2 @@
-Autotest.add_discovery { "merb" }
+Autotest.add_discovery { "rails" }
 Autotest.add_discovery { "rspec" }