Merge branch 'master' of git://github.com/bsag/tracks

test/selenium/project_detail/changing_project_name_should_change_default_project.rsel

@@ -0,0 +1,13 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/projects/1"
+
+# change project name
+click "project_name_in_place_editor"
+wait_for_element_present "css=#project_name_in_place_editor-inplaceeditor input.editor_field"
+type "css=#project_name_in_place_editor-inplaceeditor input.editor_field", "Test Foo"
+click "css=#project_name_in_place_editor-inplaceeditor input.editor_ok_button"
+wait_for_text "project_name_in_place_editor", "Test Foo"
+
+# check that the default project name is changed too
+assert_value "todo_project_name", "Test Foo"

test/selenium/tags/change_context_in_tag_view.rsel

@@ -0,0 +1,17 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/todos/tag/foo"
+wait_for_element_present "xpath=//div[@id='c1'] //h2"
+
+# change context name
+click "edit_icon_todo_1"
+wait_for_element_present "submit_todo_1"
+type "//input[@name='context_name']", "call"
+click "//button[@id='submit_todo_1']"
+wait_for_visible "flash"
+
+# check context agenda is gone
+wait_for_not_visible "c1"
+verify_text_present "Call Bill Gates to find out how much he makes per day"
+
+

test/selenium/users/delete_user.rsel

@@ -0,0 +1,7 @@
+setup :fixtures => :all
+login :as => 'admin'
+open '/users'
+assert_text_present "John Deere"
+click "//tr[@id='user-3']//img"
+assert_confirmation "Warning: this will delete user 'john', all their actions, contexts, project and notes. Are you sure that you want to continue?"
+wait_for_text_not_present "John Deere"