From e6f42cd3414b779506a3ebfa34a41294a7f4b7af Mon Sep 17 00:00:00 2001 From: lukemelia Date: Sat, 1 Dec 2007 20:20:00 +0000 Subject: [PATCH] Fix failures in Selenium tests Project listing > Edit twice and Project listing > Edit then delete. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@665 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/views/projects/_project_form.rhtml | 1 - tracks/app/views/projects/edit.rjs | 2 +- tracks/app/views/projects/update.rjs | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tracks/app/views/projects/_project_form.rhtml b/tracks/app/views/projects/_project_form.rhtml index cc657588..8aab07b9 100644 --- a/tracks/app/views/projects/_project_form.rhtml +++ b/tracks/app/views/projects/_project_form.rhtml @@ -39,7 +39,6 @@ <%= apply_behavior "."+dom_id(project, 'edit_form')+"-edit-project-form", make_remote_form( :before => "$('"+dom_id(project, 'submit')+"').startWaiting();", - :complete => "$('"+dom_id(project, 'submit')+"').stopWaiting();Effect.Appear($(this).up('.list'))", :condition => "!$('"+dom_id(project, 'submit')+"').isWaiting()", :external => false) %> diff --git a/tracks/app/views/projects/edit.rjs b/tracks/app/views/projects/edit.rjs index 5dd5ae38..2453bf38 100644 --- a/tracks/app/views/projects/edit.rjs +++ b/tracks/app/views/projects/edit.rjs @@ -2,4 +2,4 @@ page[dom_id(@project, 'edit')].replace_html :partial => 'project_form', :locals page[@project].hide page[@project].stop_waiting page[dom_id(@project, 'edit')].show -page[dom_id(@project, 'form')].down('table').down('input').focus +page[dom_id(@project, 'edit_form')].down('input.project-name').focus diff --git a/tracks/app/views/projects/update.rjs b/tracks/app/views/projects/update.rjs index bc9edc33..593575e1 100644 --- a/tracks/app/views/projects/update.rjs +++ b/tracks/app/views/projects/update.rjs @@ -14,5 +14,3 @@ page.replace_html "completed-projects-count", @completed_projects_count page.set_element_visible("list-hidden-projects-container", @hidden_projects_count > 0) page.set_element_visible("list-active-projects-container", @active_projects_count > 0) page.set_element_visible("list-completed-projects-container", @completed_projects_count > 0) - -page.hide "busy" \ No newline at end of file