diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-02-18 17:30:11 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-02-18 17:30:11 +0000 |
| commit | b0de1b1908d99b4b9a74907059158058e052c728 (patch) | |
| tree | 1b9807a2973643528cc527cef252b91cfb00e8f3 /test/functional/calendars_controller_test.rb | |
| parent | 58c643b420d919ffae07e72dc6f8f11c6de58aa9 (diff) | |
| download | redmine-b0de1b1908d99b4b9a74907059158058e052c728.tar.gz redmine-b0de1b1908d99b4b9a74907059158058e052c728.zip | |
Removed some shoulda context.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11439 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/calendars_controller_test.rb')
| -rw-r--r-- | test/functional/calendars_controller_test.rb | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb index d4b8169f9..dc302f456 100644 --- a/test/functional/calendars_controller_test.rb +++ b/test/functional/calendars_controller_test.rb @@ -26,13 +26,20 @@ class CalendarsControllerTest < ActionController::TestCase :members, :enabled_modules - def test_calendar + def test_show get :show, :project_id => 1 assert_response :success assert_template 'calendar' assert_not_nil assigns(:calendar) end + def test_show_should_run_custom_queries + @query = IssueQuery.create!(:name => 'Calendar', :is_public => true) + + get :show, :query_id => @query.id + assert_response :success + end + def test_cross_project_calendar get :show assert_response :success @@ -40,16 +47,6 @@ class CalendarsControllerTest < ActionController::TestCase assert_not_nil assigns(:calendar) end - context "GET :show" do - should "run custom queries" do - @query = IssueQuery.create!(:name => 'Calendar', :is_public => true) - - get :show, :query_id => @query.id - assert_response :success - end - - end - def test_week_number_calculation Setting.start_of_week = 7 |