replace shoulda context "#subjects" at GanttHelperTest

git-svn-id: http://svn.redmine.org/redmine/trunk@12790 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/unit/lib/redmine/helpers/gantt_test.rb

@@ -109,9 +109,7 @@ class Redmine::Helpers::GanttHelperTest < ActionView::TestCase
     assert_equal 3, @gantt.number_of_rows_on_project(@project)
   end
 
-  # TODO: more of an integration test
-  context "#subjects" do
-    setup do
+  def setup_subjects
     create_gantt
     @project.enabled_module_names = [:issue_tracking]
     @tracker = Tracker.generate!
@@ -127,58 +125,57 @@ class Redmine::Helpers::GanttHelperTest < ActionView::TestCase
                                :due_date => (today + 7))
     @project.issues << @issue
   end
+  private :setup_subjects
 
-    context "project" do
-      should "be rendered" do
+  # TODO: more of an integration test
+  test "#subjects project should be rendered" do
+    setup_subjects
     @output_buffer = @gantt.subjects
     assert_select "div.project-name a", /#{@project.name}/
   end
 
-      should "have an indent of 4" do
+  test "#subjects project should have an indent of 4" do
+    setup_subjects
     @output_buffer = @gantt.subjects
     assert_select "div.project-name[style*=left:4px]"
   end
-    end
 
-    context "version" do
-      should "be rendered" do
+  test "#subjects version should be rendered" do
+    setup_subjects
     @output_buffer = @gantt.subjects
     assert_select "div.version-name a", /#{@version.name}/
   end
 
-      should "be indented 24 (one level)" do
+  test "#subjects version should be indented 24 (one level)" do
+    setup_subjects
     @output_buffer = @gantt.subjects
     assert_select "div.version-name[style*=left:24px]"
   end
 
-      context "without assigned issues" do
-        setup do
+  test "#subjects version without assigned issues should not be rendered" do
+    setup_subjects
     @version = Version.generate!(:effective_date => (today + 14),
                                        :sharing => 'none',
                                        :name => 'empty_version')
     @project.versions << @version
-        end
-
-        should "not be rendered" do
     @output_buffer = @gantt.subjects
     assert_select "div.version-name a", :text => /#{@version.name}/, :count => 0
   end
-      end
-    end
 
-    context "issue" do
-      should "be rendered" do
+  test "#subjects issue should be rendered" do
+    setup_subjects
     @output_buffer = @gantt.subjects
     assert_select "div.issue-subject", /#{@issue.subject}/
   end
 
-      should "be indented 44 (two levels)" do
+  test "#subjects issue should be indented 44 (two levels)" do
+    setup_subjects
     @output_buffer = @gantt.subjects
     assert_select "div.issue-subject[style*=left:44px]"
   end
 
-      context "assigned to a shared version of another project" do
-        setup do
+  test "#subjects issue assigned to a shared version of another project should be rendered" do
+    setup_subjects
     p = Project.generate!
     p.enabled_module_names = [:issue_tracking]
     @shared_version = Version.generate!(:sharing => 'system')
@@ -192,16 +189,12 @@ class Redmine::Helpers::GanttHelperTest < ActionView::TestCase
                                    :start_date => (today - 1),
                                    :due_date => (today + 7))
     @project.issues << @issue
-        end
-
-        should "be rendered" do
     @output_buffer = @gantt.subjects
     assert_select "div.issue-subject", /#{@issue.subject}/
   end
-      end
 
-      context "with subtasks" do
-        setup do
+  test "#subjects issue with subtasks should indent subtasks" do
+    setup_subjects
     attrs = {:project => @project, :tracker => @tracker, :fixed_version => @version}
     @child1 = Issue.generate!(
                        attrs.merge(:subject => 'child1',
@@ -221,9 +214,6 @@ class Redmine::Helpers::GanttHelperTest < ActionView::TestCase
                                       :start_date => (today - 1),
                                       :due_date => (today + 2))
                           )
-        end
-
-        should "indent subtasks" do
     @output_buffer = @gantt.subjects
     # parent task 44px
     assert_select "div.issue-subject[style*=left:44px]", /#{@issue.subject}/
@@ -233,9 +223,6 @@ class Redmine::Helpers::GanttHelperTest < ActionView::TestCase
     # grandchild 84px
     assert_select "div.issue-subject[style*=left:84px]", /grandchild/, @output_buffer
   end
-      end
-    end
-  end
 
   context "#lines" do
     setup do