Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-09-22 05:50:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix failing selenium tests

Browse source
This commit is contained in:
Reinier Balt 2011-10-28 20:51:02 +02:00
parent bfb6c4ee9a
commit 29e1de8ef2
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/update.js.erb
View file

@ -30,7 +30,7 @@ function update_project_page() {
remove_project_edit_form(); remove_project_edit_form();
update_and_show_project_settings(); update_and_show_project_settings();
TracksForm.set_project_name("<%= escape_javascript(@project.name)%>"); TracksForm.set_project_name("<%= escape_javascript(@project.name)%>");
$("h2#project_name").html("<%= escape_javascript(@project.name)%>"); $("h2 div#project_name").html("<%= escape_javascript(@project.name)%>");
<% if @project.default_context %> <% if @project.default_context %>
TracksForm.set_context_name_and_default_context_name("<%= escape_javascript(@project.default_context.name)%>"); TracksForm.set_context_name_and_default_context_name("<%= escape_javascript(@project.default_context.name)%>");
<% end %> <% end %>

2
features/step_definitions/project_steps.rb
View file

@ -274,7 +274,7 @@ end
Then /^the project title should be "(.*)"$/ do |title| Then /^the project title should be "(.*)"$/ do |title|
wait_for :timeout => 2 do wait_for :timeout => 2 do
selenium.get_text("css=h2#project_name") == title selenium.get_text("css=h2#project_name_container div#project_name") == title
end end
end end

8
public/javascripts/application.js
View file

@ -305,19 +305,19 @@ var TracksPages = {
$(".todo_notes").toggle(); $(".todo_notes").toggle();
}); });
/* Poor man's perspectives, allows to hide any context that is collapsed */ /* Poor man's perspectives, allows to hide any context that is collapsed */
$("#toggle-contexts-nav").click(function () { $("#toggle-contexts-nav").click(function () {
/* Need to keep a single toggle across all contexts */ /* Need to keep a single toggle across all contexts */
$(this).toggleClass("context_visibility"); $(this).toggleClass("context_visibility");
if ($(this).hasClass("context_visibility")) { if ($(this).hasClass("context_visibility")) {
$(".context_collapsed").hide(); /* Hide all collapsed contexts together*/ $(".context_collapsed").hide(); /* Hide all collapsed contexts together*/
} }
else { else {
$(".context_collapsed").show(); $(".context_collapsed").show();
} }
}); });
/* fade flashes and alerts in automatically */ /* fade flashes and alerts in automatically */
$(".alert").fadeOut(8000); $(".alert").fadeOut(8000);
} }