jro_apps/redmine Commit - r11634:474c01074638

Removed some shoulda context....

Jean-Philippe Lang -

r11634:474c01074638

parent child

Context file:

r11634:474c01074638

Collapse all files

test/functional/welcome_controller_test.rb +6 -32

                 end
               end
-              context "test_api_offset_and_limit" do
+              def test_api_offset_and_limit_without_params
-                context "without params" do
-                  should "return 0, 25" do
                 assert_equal [0, 25], @controller.api_offset_and_limit({})
               end
-                end
-                context "with limit" do
+              def test_api_offset_and_limit_with_limit
-                  should "return 0, limit" do
                 assert_equal [0, 30], @controller.api_offset_and_limit({:limit => 30})
-                  end
-                  should "not exceed 100" do
                 assert_equal [0, 100], @controller.api_offset_and_limit({:limit => 120})
-                  end
-                  should "not be negative" do
                 assert_equal [0, 25], @controller.api_offset_and_limit({:limit => -10})
               end
-                end
-                context "with offset" do
+              def test_api_offset_and_limit_with_offset
-                  should "return offset, 25" do
                 assert_equal [10, 25], @controller.api_offset_and_limit({:offset => 10})
-                  end
-                  should "not be negative" do
                 assert_equal [0, 25], @controller.api_offset_and_limit({:offset => -10})
               end
-                  context "and limit" do
+              def test_api_offset_and_limit_with_offset_and_limit
-                    should "return offset, limit" do
                 assert_equal [10, 50], @controller.api_offset_and_limit({:offset => 10, :limit => 50})
               end
-                  end
-                end
-                context "with page" do
+              def test_api_offset_and_limit_with_page
-                  should "return offset, 25" do
                 assert_equal [0, 25], @controller.api_offset_and_limit({:page => 1})
                 assert_equal [50, 25], @controller.api_offset_and_limit({:page => 3})
-                  end
-                  should "not be negative" do
                 assert_equal [0, 25], @controller.api_offset_and_limit({:page => 0})
                 assert_equal [0, 25], @controller.api_offset_and_limit({:page => -2})
               end
-                  context "and limit" do
+              def test_api_offset_and_limit_with_page_and_limit
-                    should "return offset, limit" do
                 assert_equal [0, 100], @controller.api_offset_and_limit({:page => 1, :limit => 100})
                 assert_equal [200, 100], @controller.api_offset_and_limit({:page => 3, :limit => 100})
               end
             end
-                end
-              end
-            end

test/unit/helpers/application_helper_test.rb +2 -8

                 set_tmp_attachments_directory
               end
-              context "#link_to_if_authorized" do
+              test "#link_to_if_authorized for authorized user should allow using the :controller and :action for the target link" do
-                context "for authorized user" do
-                  should "allow using the :controller and :action for the target link" do
                 User.current = User.find_by_login('admin')
                 @project = Issue.first.project # Used by helper
                                                 {:controller => 'issues', :action => 'edit', :id => Issue.first.id})
                 assert_match /href/, response
               end
-                end
-                context "for unauthorized user" do
+              test "#link_to_if_authorized for unauthorized user should display nothing if user isn't authorized" do
-                  should "display nothing if user isn't authorized" do
                 User.current = User.find_by_login('dlopper')
                 @project = Project.find('private-child')
                 issue = @project.issues.first
                                                 {:controller => 'issues', :action => 'show', :id => issue})
                 assert_nil response
               end
-                end
-              end
               def test_auto_links
                 to_test = {

test/unit/role_test.rb +10 -26

                 assert_equal Role.all.reject(&:builtin?).sort, Role.find_all_givable
               end
-              context "#anonymous" do
+              def test_anonymous_should_return_the_anonymous_role
-                should "return the anonymous role" do
+                assert_no_difference('Role.count') do
                   role = Role.anonymous
                   assert role.builtin?
                   assert_equal Role::BUILTIN_ANONYMOUS, role.builtin
                 end
-                context "with a missing anonymous role" do
-                  setup do
-                    Role.delete_all("builtin = #{Role::BUILTIN_ANONYMOUS}")
               end
-                  should "create a new anonymous role" do
+              def test_anonymous_with_a_missing_anonymous_role_should_return_the_anonymous_role
-                    assert_difference('Role.count') do
+                Role.where(:builtin => Role::BUILTIN_ANONYMOUS).delete_all
-                      Role.anonymous
-                    end
-                  end
-                  should "return the anonymous role" do
+                assert_difference('Role.count') do
                   role = Role.anonymous
                   assert role.builtin?
                   assert_equal Role::BUILTIN_ANONYMOUS, role.builtin
                 end
               end
-              end
-              context "#non_member" do
+              def test_non_member_should_return_the_non_member_role
-                should "return the non-member role" do
+                assert_no_difference('Role.count') do
                   role = Role.non_member
                   assert role.builtin?
                   assert_equal Role::BUILTIN_NON_MEMBER, role.builtin
                 end
-                context "with a missing non-member role" do
-                  setup do
-                    Role.delete_all("builtin = #{Role::BUILTIN_NON_MEMBER}")
               end
-                  should "create a new non-member role" do
+              def test_non_member_with_a_missing_non_member_role_should_return_the_non_member_role
-                    assert_difference('Role.count') do
+                Role.where(:builtin => Role::BUILTIN_NON_MEMBER).delete_all
-                      Role.non_member
-                    end
-                  end
-                  should "return the non-member role" do
+                assert_difference('Role.count') do
                   role = Role.non_member
                   assert role.builtin?
                   assert_equal Role::BUILTIN_NON_MEMBER, role.builtin
                 end
               end
             end
-            end

test/unit/wiki_test.rb +3 -7

                 assert_equal ja_test, Wiki.titleize(ja_test)
               end
-              context "#sidebar" do
+              def test_sidebar_should_return_nil_if_undefined
-                setup do
                 @wiki = Wiki.find(1)
-                end
-                should "return nil if undefined" do
                 assert_nil @wiki.sidebar
               end
-                should "return a WikiPage if defined" do
+              def test_sidebar_should_return_a_wiki_page_if_defined
+                @wiki = Wiki.find(1)
                 page = @wiki.pages.new(:title => 'Sidebar')
                 page.content = WikiContent.new(:text => 'Side bar content for test_show_with_sidebar')
                 page.save!
                 assert_equal 'Sidebar', @wiki.sidebar.title
               end
             end
-            end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages