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 regressions

Browse source
This commit is contained in:
Reinier Balt 2014-01-11 14:33:14 +01:00
parent 3b673f0838
commit 6238029b55
6 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -31,7 +31,6 @@ gem "htmlentities"
gem "swf_fu" gem "swf_fu"
gem "rails_autolink" gem "rails_autolink"
gem "cache_digests" gem "cache_digests"
gem "rack-mini-profiler"
# To use ActiveModel has_secure_password # To use ActiveModel has_secure_password
gem 'bcrypt-ruby', '~> 3.0.0' gem 'bcrypt-ruby', '~> 3.0.0'
@ -46,6 +45,7 @@ group :development do
gem "yard" gem "yard"
gem "tolk" gem "tolk"
gem "bullet" gem "bullet"
gem "rack-mini-profiler"
end end
group :test do group :test do

2
app/helpers/application_helper.rb
View file

@ -245,7 +245,7 @@ module ApplicationHelper
when "projects" when "projects"
send("#{type}_todos_project_path", @project) send("#{type}_todos_project_path", @project)
when "todos" when "todos"
if source_view_is(:tag) if @tag_name
send("#{type}_tag_path",@tag_name) send("#{type}_tag_path",@tag_name)
else else
send("#{type}_todos_path") send("#{type}_todos_path")

2
config/initializers/rack-mini-profiler.rb
View file

@ -1,2 +1,2 @@
# Have Mini Profiler show up on the right # Have Mini Profiler show up on the right
Rack::MiniProfiler.config.position = 'right' Rack::MiniProfiler.config.position = 'right' if defined?(Rack::MiniProfiler)

4
features/shared_add_new_todo.feature
View file

@ -192,9 +192,9 @@ Feature: Add new next action from every page
And I have selected the view for group by <grouping> And I have selected the view for group by <grouping>
When I go to the <page> 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" 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" 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: Scenarios:
| page | grouping | see_hidden | see_visible | | page | grouping | see_hidden | see_visible |

2
features/tagging_todos.feature
View file

@ -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 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" 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" 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 @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 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

1
lib/tasks/continuous_integration.rake
View file

@ -10,7 +10,6 @@ task :ci do |t|
SimpleCov.start 'rails' SimpleCov.start 'rails'
[:environment, 'db:migrate', 'test:all', 'cucumber'].each do |t| [:environment, 'db:migrate', 'test:all', 'cucumber'].each do |t|
print "running '#{t}'\n"
Rake::Task[t].invoke Rake::Task[t].invoke
end end
end end