start fiingx failing cucumber scenario's and some small fixes

new capybara introduces some failing scenario's
This commit is contained in:
Reinier Balt 2012-12-23 23:16:22 +01:00
parent c8d2db6fc3
commit da2bee2e53
10 changed files with 42 additions and 19 deletions

View file

@ -3,6 +3,6 @@
<a href="https://github.com/TracksApp/tracks/wiki"><%= t('common.wiki')%></a> |
<a href="http://groups.google.com/group/TracksApp"><%= t('common.mailing_list')%></a> |
<a href="http://getontracks.org/"><%= t('common.website')%></a> |
<a href="http://getontracks.org/development/"><%= t('common.contribute')%></a></p>
<%= link_to(t('layouts.navigation.mobile'), todos_path(:format => 'm')) %>
<a href="http://getontracks.org/development/"><%= t('common.contribute')%></a> |
<%= link_to(t('layouts.navigation.mobile'), todos_path(:format => 'm')) %></p>
</div>

View file

@ -40,7 +40,7 @@ function add_todo_to_existing_context() {
<% unless source_view_is_one_of(:todo, :tag) && (@todo.deferred?||@todo.hidden?) -%>
$('#c<%= @todo.context_id %>').fadeIn(500, function() {});
$('#no_todos_in_view').slideUp(100);
<%= "$('#tickler-empty-nd').slideUp(100);" if source_view_is(:deferred) && @todo.deferred? %>
<%= "$('#tickler-empty-nd').slideUp(100);".html_safe if source_view_is(:deferred) && @todo.deferred? %>
<% end -%>
<% end -%>
$('#<%=empty_container_msg_div_id%>').hide();

View file

@ -72,7 +72,7 @@ function replace_todo(next_steps) {
function hide_context(next_steps) {
<% context_id = @context_changed ? @original_item_context_id : @todo.context_id -%>
$('#c<%= context_id %>').fadeOut(400, function(){ next_steps.go(); });
<%= "$('#tickler-empty-nd').slideDown(400);" if source_view_is(:deferred) && @down_count == 0 %>
<%= "$('#tickler-empty-nd').slideDown(400);".html_safe if source_view_is(:deferred) && @down_count == 0 %>
}
function highlight_updated_todo(next_steps) {