Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock
	config/routes.rb

features/step_definitions/container_steps.rb

@@ -11,7 +11,9 @@ When(/^I collapse the project container of "(.*?)"$/) do |project_name|
 end
 
 When /^I toggle all collapsed context containers$/ do
-  click_link 'Toggle collapsed contexts'
+  open_view_menu do
+    click_link 'Toggle collapsed contexts'
+  end
 end
 
 ####### Context #######
@@ -91,7 +93,6 @@ Then(/^I should (not see|see) "([^"]*)" in the (completed|done today|done this w
   id = 'completed_rest_of_month_container'  if container == 'done this month'
 
   css = "div##{id} div#line_todo_#{find_todo(todo_description).id}"
-  page.should have_css(css)
   check_css_visibility(visible, css)
 end
 
@@ -138,9 +139,8 @@ end
 
 Then /^I should (see|not see) empty message for (done today|done this week|done this month|completed todos|deferred todos|todos) (of done actions|of context|of project|of home|of tag)/ do |visible, state, type|
   css = "error: wrong state"
-  css = "div#c#{@context.id}-empty-d"             if state == "todos" && type == "of context"
-  css = "div#p#{@project.id}-empty-d"             if state == "todos" && type == "of project"
-  css = "div#no_todos_in_view"                    if state == "todos" && (type == "of home" || type == "of tag")
+  css = "div#c#{@context.id}-empty-d"             if state == "todos" 
+  css = "div#no_todos_in_view"                    if state == "todos" && ["of home", "of tag", "of context", "of project"].include?(type)
   css = "div#completed_today_container"           if state == "done today"
   css = "div#completed_rest_of_week_container"    if state == "done this week"
   css = "div#completed_rest_of_month_container"   if state == "done this month"

features/step_definitions/login_steps.rb

@@ -1,13 +1,7 @@
 Given /^I have logged in as "(.*)" with password "(.*)"$/ do |username, password|
-  step "I go to the login page"
-  fill_in "user_login", :with => username
-  fill_in "user_password", :with => password
-  uncheck "user_noexpiry"
-  click_button "Sign in"
-  
-  logout_regexp = @mobile_interface ? "Logout" : "Logout \(#{username}\)"
-  page.should have_content(logout_regexp)
-  @current_user = User.where(:login => username).first
+  user = User.where(:login => username).first
+  request_signin_as(user)
+  @current_user = user
 end
 
 When /^I submit the login form as user "([^\"]*)" with password "([^\"]*)"$/ do |username, password|

features/step_definitions/note_steps.rb

@@ -30,7 +30,7 @@ When /^I edit the first note to "([^"]*)"$/ do |note_body|
   end
 end
 
-When /^I toggle the note of "([^"]*)"$/ do |todo_description|
+When(/^I toggle the note of "([^"]*)"$/) do |todo_description|
   todo = @current_user.todos.where(:description => todo_description).first
   todo.should_not be_nil
 
@@ -39,7 +39,9 @@ When /^I toggle the note of "([^"]*)"$/ do |todo_description|
 end
 
 When /^I click Toggle Notes$/ do
-  click_link 'Toggle notes'
+  open_view_menu do
+    click_link 'Toggle notes'
+  end
 end
 
 When /^I toggle all notes$/ do

features/step_definitions/todo_create_steps.rb

@@ -70,9 +70,9 @@ Given /^I have ([0-9]+) todos$/ do |count|
 end
 
 Given /^I have a todo with description "([^"]*)" in project "([^"]*)" with tags "([^"]*)" in the context "([^"]*)"$/ do |action_description, project_name, tags, context_name|
-  context = @current_user.contexts.where(:name => context_name).first_or_create
-  project = @current_user.projects.where(:name => project_name).first_or_create
-  @todo = @current_user.todos.create!(:context_id => context.id, :project_id => project.id, :description => action_description)
+  @context = @current_user.contexts.where(:name => context_name).first_or_create
+  @project = @current_user.projects.where(:name => project_name).first_or_create
+  @todo = @current_user.todos.create!(:context_id => @context.id, :project_id => @project.id, :description => action_description)
   @todo.tag_with(tags)
   @todo.save
 end