summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-09-20 04:05:31 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-09-20 04:05:31 +0000
commit46fc8783966866700a0146de9e74ff1e900e4aca (patch)
treebc2104c3363c58c481cb634d4867fc5cf0c0d46a
parentd1952aefb8e332967245434a664f2fee853e31ff (diff)
downloadredmine-46fc8783966866700a0146de9e74ff1e900e4aca.tar.gz
redmine-46fc8783966866700a0146de9e74ff1e900e4aca.zip
Merged r4082 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4143 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/versions/index.html.erb2
-rw-r--r--test/functional/versions_controller_test.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 100282a7a..d0c5dcac1 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -51,4 +51,4 @@
<% html_title(l(:label_roadmap)) %>
-<%= context_menu :controller => 'issues', :action => 'context_menu' %>
+<%= context_menu issues_context_menu_path %>
diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index 5fcb1d05a..f738794ae 100644
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -40,6 +40,8 @@ class VersionsControllerTest < ActionController::TestCase
assert assigns(:versions).include?(Version.find(3))
# Completed version doesn't appear
assert !assigns(:versions).include?(Version.find(1))
+ # Context menu on issues
+ assert_select "script", :text => Regexp.new(Regexp.escape("new ContextMenu('/issues/context_menu')"))
end
def test_index_with_completed_versions