jro_apps/redmine Commit - r13815:d904292635b1

Merged r14156 and r14161 (#19400)....

Jean-Philippe Lang -

r13815:d904292635b1

parent child

Context file:

r13815:d904292635b1

app/models/repository.rb +5 0

               serialize :extra_info
+              before_validation :normalize_identifier
               before_save :check_default
               # Raw SQL to delete changesets and changes in the database
                 end
               end
+              def normalize_identifier
+                self.identifier = identifier.to_s.strip
+              end
               def check_default
                 if !is_default? && set_as_default?
                   self.is_default = true

test/functional/repositories_git_controller_test.rb +1 -1

                 def test_diff
                   assert_equal true, @repository.is_default
-                  assert_nil @repository.identifier
+                  assert @repository.identifier.blank?
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload

test/unit/repository_git_test.rb +2 0

               end
               def test_nondefault_repo_with_blank_identifier_destruction
+                Repository.delete_all
                 repo1 = Repository::Git.new(
                                       :project    => @project,
                                       :url        => REPOSITORY_PATH,

test/unit/repository_test.rb +12 0

@@ -94,6 +94,18 class RepositoryTest < ActiveSupport::TestCase
94	assert !r.save	94	assert !r.save
95	end	95	end
96		96
		97	def test_2_repositories_with_blank_identifier_and_one_as_default_should_not_be_valid
		98	Repository::Subversion.create!(:project_id => 3, :identifier => '', :url => 'file:///foo', :is_default => true)
		99	r = Repository::Subversion.new(:project_id => 3, :identifier => '', :url => 'file:///bar')
		100	assert !r.save
		101	end
		102
		103	def test_2_repositories_with_blank_and_nil_identifier_should_not_be_valid
		104	Repository::Subversion.create!(:project_id => 3, :identifier => nil, :url => 'file:///foo')
		105	r = Repository::Subversion.new(:project_id => 3, :identifier => '', :url => 'file:///bar')
		106	assert !r.save
		107	end
		108
97	def test_first_repository_should_be_set_as_default	109	def test_first_repository_should_be_set_as_default
98	repository1 = Repository::Subversion.new(	110	repository1 = Repository::Subversion.new(
99	:project => Project.find(3),	111	:project => Project.find(3),

General Comments 0

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

No TODOs yet

	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