From 6238029b55cb599cf4e9266da2d3ec6b6ef34439 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Sat, 11 Jan 2014 14:33:14 +0100
Subject: [PATCH] fix regressions

---
 Gemfile                                   | 2 +-
 app/helpers/application_helper.rb         | 2 +-
 config/initializers/rack-mini-profiler.rb | 2 +-
 features/shared_add_new_todo.feature      | 4 ++--
 features/tagging_todos.feature            | 2 +-
 lib/tasks/continuous_integration.rake     | 1 -
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 58eeb40c..ca25a324 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,6 @@ gem "htmlentities"
 gem "swf_fu"
 gem "rails_autolink"
 gem "cache_digests"
-gem "rack-mini-profiler"
 
 # To use ActiveModel has_secure_password
 gem 'bcrypt-ruby', '~> 3.0.0'
@@ -46,6 +45,7 @@ group :development do
   gem "yard"
   gem "tolk"
   gem "bullet"
+  gem "rack-mini-profiler"
 end
 
 group :test do
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index db0aed76..f4238999 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -245,7 +245,7 @@ module ApplicationHelper
     when "projects"
       send("#{type}_todos_project_path", @project)
     when "todos"
-      if source_view_is(:tag)
+      if @tag_name
         send("#{type}_tag_path",@tag_name)
       else
         send("#{type}_todos_path")
diff --git a/config/initializers/rack-mini-profiler.rb b/config/initializers/rack-mini-profiler.rb
index 93d2e299..230fa550 100644
--- a/config/initializers/rack-mini-profiler.rb
+++ b/config/initializers/rack-mini-profiler.rb
@@ -1,2 +1,2 @@
 # Have Mini Profiler show up on the right
-Rack::MiniProfiler.config.position = 'right'
\ No newline at end of file
+Rack::MiniProfiler.config.position = 'right' if defined?(Rack::MiniProfiler)
\ No newline at end of file
diff --git a/features/shared_add_new_todo.feature b/features/shared_add_new_todo.feature
index 71c5b724..bf3ec31e 100644
--- a/features/shared_add_new_todo.feature
+++ b/features/shared_add_new_todo.feature
@@ -192,9 +192,9 @@ Feature: Add new next action from every page
     And I have selected the view for group by <grouping>
     When I go to the <page>
     And I submit a new action with description "hidden todo" to project "hidden project" with tags "test" in the context "visible context"
-    Then I should <see_hidden> "hidden todo"
+    Then I should <see_hidden> the todo "hidden todo"
     When I submit a new action with description "visible todo" to project "visible project" with tags "test" in the context "visible context"
-    Then I should <see_visible> "visible todo"
+    Then I should <see_visible> the todo "visible todo"
 
     Scenarios:
       | page                               | grouping | see_hidden | see_visible |
diff --git a/features/tagging_todos.feature b/features/tagging_todos.feature
index d67d1973..dd3fef30 100644
--- a/features/tagging_todos.feature
+++ b/features/tagging_todos.feature
@@ -33,7 +33,7 @@ Feature: Tagging todos
   Scenario: I can add a new todo from tag view with a different tag and it will not be added to the page
     When I go to the tag page for "tracks"
     And I submit a new action with description "prepare release" and the tags "release, next" in the context "@pc"
-    Then I should not see "prepare release"
+    Then I should not see the todo "prepare release"
 
   @javascript
   Scenario: I can move a tagged todo in tag view to a hidden project and it will move the todo on the page to the hidden container
diff --git a/lib/tasks/continuous_integration.rake b/lib/tasks/continuous_integration.rake
index 5a393c11..f54ede26 100644
--- a/lib/tasks/continuous_integration.rake
+++ b/lib/tasks/continuous_integration.rake
@@ -10,7 +10,6 @@ task :ci do |t|
   SimpleCov.start 'rails'
 
   [:environment, 'db:migrate', 'test:all', 'cucumber'].each do |t|
-    print "running '#{t}'\n"
     Rake::Task[t].invoke
   end
 end
\ No newline at end of file