##// END OF EJS Templates
Drop shoulda....
Jean-Philippe Lang -
r13294:f04148695a4a
parent child
Show More
@@ -86,7 +86,6 end
86
86
87 group :test do
87 group :test do
88 gem "minitest"
88 gem "minitest"
89 gem "shoulda-context"
90 gem "mocha", "~> 1.0.0", :require => 'mocha/api'
89 gem "mocha", "~> 1.0.0", :require => 'mocha/api'
91 # For running UI tests
90 # For running UI tests
92 gem "capybara", "~> 2.1.0"
91 gem "capybara", "~> 2.1.0"
@@ -15,7 +15,6
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 #require 'shoulda'
19 ENV["RAILS_ENV"] = "test"
18 ENV["RAILS_ENV"] = "test"
20 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
19 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
21 require 'rails/test_help'
20 require 'rails/test_help'
@@ -34,9 +33,6 end
34
33
35 class ActiveSupport::TestCase
34 class ActiveSupport::TestCase
36 include ActionDispatch::TestProcess
35 include ActionDispatch::TestProcess
37 include Shoulda::Context::Assertions
38 include Shoulda::Context::InstanceMethods
39 extend Shoulda::Context::ClassMethods
40
36
41 self.use_transactional_fixtures = true
37 self.use_transactional_fixtures = true
42 self.use_instantiated_fixtures = false
38 self.use_instantiated_fixtures = false
@@ -328,7 +328,7 class MailHandlerTest < ActiveSupport::TestCase
328 )
328 )
329 end
329 end
330 user = User.order('id DESC').first
330 user = User.order('id DESC').first
331 assert_same_elements [group1, group2], user.groups
331 assert_equal [group1, group2].sort, user.groups.sort
332 end
332 end
333
333
334 def test_created_user_should_not_receive_account_information_with_no_account_info_option
334 def test_created_user_should_not_receive_account_information_with_no_account_info_option
@@ -481,7 +481,8 class ProjectTest < ActiveSupport::TestCase
481 project = Project.generate!
481 project = Project.generate!
482 parent_version_1 = Version.generate!(:project => project)
482 parent_version_1 = Version.generate!(:project => project)
483 parent_version_2 = Version.generate!(:project => project)
483 parent_version_2 = Version.generate!(:project => project)
484 assert_same_elements [parent_version_1, parent_version_2], project.rolled_up_versions
484 assert_equal [parent_version_1, parent_version_2].sort,
485 project.rolled_up_versions.sort
485 end
486 end
486
487
487 test "#rolled_up_versions should include versions for a subproject" do
488 test "#rolled_up_versions should include versions for a subproject" do
@@ -491,11 +492,8 class ProjectTest < ActiveSupport::TestCase
491 subproject = Project.generate_with_parent!(project)
492 subproject = Project.generate_with_parent!(project)
492 subproject_version = Version.generate!(:project => subproject)
493 subproject_version = Version.generate!(:project => subproject)
493
494
494 assert_same_elements [
495 assert_equal [parent_version_1, parent_version_2, subproject_version].sort,
495 parent_version_1,
496 project.rolled_up_versions.sort
496 parent_version_2,
497 subproject_version
498 ], project.rolled_up_versions
499 end
497 end
500
498
501 test "#rolled_up_versions should include versions for a sub-subproject" do
499 test "#rolled_up_versions should include versions for a sub-subproject" do
@@ -507,11 +505,8 class ProjectTest < ActiveSupport::TestCase
507 sub_subproject_version = Version.generate!(:project => sub_subproject)
505 sub_subproject_version = Version.generate!(:project => sub_subproject)
508 project.reload
506 project.reload
509
507
510 assert_same_elements [
508 assert_equal [parent_version_1, parent_version_2, sub_subproject_version].sort,
511 parent_version_1,
509 project.rolled_up_versions.sort
512 parent_version_2,
513 sub_subproject_version
514 ], project.rolled_up_versions
515 end
510 end
516
511
517 test "#rolled_up_versions should only check active projects" do
512 test "#rolled_up_versions should only check active projects" do
@@ -524,7 +519,8 class ProjectTest < ActiveSupport::TestCase
524 project.reload
519 project.reload
525
520
526 assert !subproject.active?
521 assert !subproject.active?
527 assert_same_elements [parent_version_1, parent_version_2], project.rolled_up_versions
522 assert_equal [parent_version_1, parent_version_2].sort,
523 project.rolled_up_versions.sort
528 end
524 end
529
525
530 def test_shared_versions_none_sharing
526 def test_shared_versions_none_sharing
General Comments 0
You need to be logged in to leave comments. Login now