Rework tests to be more accurate and isolated with various small fixes

Author: root

Diff for: app/models/git_cache.rb

@@ -1,5 +1,6 @@
 class GitCache < ActiveRecord::Base
   unloadable
 
+  ## Attributes
   attr_accessible :repo_identifier, :command, :command_output
 end

Diff for: app/models/github_comment.rb

@@ -1,8 +1,10 @@
 class GithubComment < ActiveRecord::Base
   unloadable
 
+  ## Relations
   belongs_to :journal
 
+  ## Validations
   validates :github_id,  :presence => true
   validates :journal_id, :presence => true, :uniqueness => { :scope => :github_id }
 end

Diff for: app/models/github_issue.rb

@@ -1,8 +1,10 @@
 class GithubIssue < ActiveRecord::Base
   unloadable
 
+  ## Relations
   belongs_to :issue
 
+  ## Validations
   validates :github_id, :presence => true
   validates :issue_id,  :presence => true, :uniqueness => { :scope => :github_id }
 end

Diff for: app/models/gitolite_public_key.rb

@@ -1,13 +1,14 @@
 class GitolitePublicKey < ActiveRecord::Base
   unloadable
 
-  TITLE_LENGTH_LIMIT = 255
+  TITLE_LENGTH_LIMIT = 60
 
   KEY_TYPE_USER   = 0
   KEY_TYPE_DEPLOY = 1
 
   DEPLOY_PSEUDO_USER = "deploy_key"
 
+  ## Attributes
   attr_accessible :title, :key, :key_type, :delete_when_unused
 
   ## Relations
@@ -21,8 +22,12 @@ class GitolitePublicKey < ActiveRecord::Base
                           :length => { :maximum => TITLE_LENGTH_LIMIT }, :format => /\A[a-z0-9_\-]*\z/i
 
   validates :identifier,  :presence => true, :uniqueness => { :case_sensitive => false, :scope => :user_id }
+
   validates :key,         :presence => true
-  validates :key_type,    :presence => true, :inclusion => { :in => [KEY_TYPE_USER, KEY_TYPE_DEPLOY] }
+
+  validates :key_type,    :presence => true,
+                          :numericality => { :only_integer => true },
+                          :inclusion => { :in => [KEY_TYPE_USER, KEY_TYPE_DEPLOY] }
 
   validate :has_not_been_changed
   validate :key_correctness
@@ -145,11 +150,11 @@ def destroy_ssh_key
 
   # Strip leading and trailing whitespace
   def strip_whitespace
-    self.title = title.strip
+    self.title = title.strip rescue ''
 
     # Don't mess with existing keys (since cannot change key text anyway)
     if new_record?
-      self.key = key.strip
+      self.key = key.strip rescue ''
     end
   end
 
@@ -231,9 +236,10 @@ def has_not_been_changed
 
 
   def key_correctness
+    return false if self.key.nil?
     # Test correctness of fingerprint from output
     # and general ssh-(r|d|ecd)sa <key> <id> structure
-    (self.fingerprint =~ /^(\w{2}:?)+$/i) && (self.key.match(/^(\S+)\s+(\S+)/))
+    (self.key.match(/^(\S+)\s+(\S+)/)) && (self.fingerprint =~ /^(\w{2}:?)+$/i)
   end
 
 

Diff for: app/models/repository_deployment_credential.rb

@@ -7,6 +7,7 @@ class RepositoryDeploymentCredential < ActiveRecord::Base
   VALID_PERMS  = [ "R", "RW+" ]
   DEFAULT_PERM = "RW+"
 
+  ## Attributes
   attr_accessible :perm, :active
 
   ## Relations

Diff for: app/models/repository_git_config_key.rb

@@ -1,6 +1,7 @@
 class RepositoryGitConfigKey < ActiveRecord::Base
   unloadable
 
+  ## Attributes
   attr_accessible :key, :value
 
   ## Relations
@@ -9,13 +10,12 @@ class RepositoryGitConfigKey < ActiveRecord::Base
   ## Validations
   validates :repository_id, :presence => true
 
-  validates :key,           :presence => true,
-                            :uniqueness => { :case_sensitive => false, :scope => :repository_id }
+  validates :key,           :presence   => true,
+                            :uniqueness => { :case_sensitive => false, :scope => :repository_id },
+                            :format     => { :with => /^\A[a-zA-Z0-9]+\.[a-zA-Z0-9.]+\z/ }
 
   validates :value,         :presence => true
 
-  validate :check_key_format
-
   ## Callbacks
   after_commit ->(obj) { obj.create_or_update_config_key }, :on => :create
   after_commit ->(obj) { obj.create_or_update_config_key }, :on => :update
@@ -41,14 +41,6 @@ def delete_config_key
   private
 
 
-  def check_key_format
-    if !self.key.include?('.')
-      errors.add(:key, :error_wrong_config_key_format)
-      return false
-    end
-  end
-
-
   def update_repository(options)
     RedmineGitolite::GitHosting.logger.info { "Rebuild Git config keys respository : '#{repository.gitolite_repository_name}'" }
     RedmineGitolite::GitHosting.resync_gitolite(:update_repository, repository.id, options)

Diff for: app/models/repository_git_extra.rb

@@ -6,6 +6,7 @@ class RepositoryGitExtra < ActiveRecord::Base
   HTTPS    = 2
   BOTH     = 3
 
+  ## Attributes
   attr_accessible :git_http, :git_daemon, :git_notify, :default_branch, :protected_branch
 
   ## Relations

Diff for: app/models/repository_git_notification.rb

@@ -3,13 +3,16 @@ class RepositoryGitNotification < ActiveRecord::Base
 
   VALID_EMAIL_REGEX  = /\A[\w+\-.]+@[a-z\d\-]+(?:\.[a-z\d\-]+)*\.[a-z]+\z/i
 
+  ## Attributes
   attr_accessible :prefix, :sender_address, :include_list, :exclude_list
 
   ## Relations
   belongs_to :repository
 
   ## Validations
-  validates :repository_id,  :presence => true
+  validates :repository_id,  :presence   => true,
+                             :uniqueness => true
+
   validates :sender_address, :format => { :with => VALID_EMAIL_REGEX, :allow_blank => true }
 
   validate :validate_mailing_list

Diff for: app/models/repository_mirror.rb

@@ -8,6 +8,7 @@ class RepositoryMirror < ActiveRecord::Base
   PUSHMODE_FORCE        = 1
   PUSHMODE_FAST_FORWARD = 2
 
+  ## Attributes
   attr_accessible :url, :push_mode, :include_all_branches, :include_all_tags, :explicit_refspec, :active
 
   ## Relations
@@ -21,7 +22,7 @@ class RepositoryMirror < ActiveRecord::Base
   ## ssh://[email protected]:2222/project1/project2/project3/project4.git
   validates :url, :presence   => true,
                   :uniqueness => { :case_sensitive => false, :scope => :repository_id },
-                  :format     => { :with => /^(ssh:\/\/)([\w\.@]+)(\:[\d]+)?([\w\/\-~]+)(\.git)?$/i }
+                  :format     => { :with => /\A(ssh:\/\/)([\w\.@]+)(\:[\d]+)?([\w\/\-~]+)(\.git)?\z/i }
 
   validates :push_mode, :presence     => true,
                         :numericality => { :only_integer => true },
@@ -101,8 +102,8 @@ def push_args
 
   # Strip leading and trailing whitespace
   def strip_whitespace
-    self.url = url.strip
-    self.explicit_refspec = explicit_refspec.strip
+    self.url = url.strip rescue ''
+    self.explicit_refspec = explicit_refspec.strip rescue ''
   end
 
 

Diff for: app/models/repository_post_receive_url.rb

@@ -6,6 +6,7 @@ class RepositoryPostReceiveUrl < ActiveRecord::Base
   STATUS_ACTIVE   = true
   STATUS_INACTIVE = false
 
+  ## Attributes
   attr_accessible :url, :mode, :active, :use_triggers, :triggers, :split_payloads
 
   ## Relations
@@ -14,7 +15,7 @@ class RepositoryPostReceiveUrl < ActiveRecord::Base
   ## Validations
   validates :repository_id, :presence => true
 
-  ## Only allow HTTP(s) format
+  # Only allow HTTP(s) format
   validates :url, :presence   => true,
                   :uniqueness => { :case_sensitive => false, :scope => :repository_id },
                   :format     => { :with => URI::regexp(%w(http https)) }
@@ -73,7 +74,7 @@ def needs_push(payloads)
 
   # Strip leading and trailing whitespace
   def strip_whitespace
-    self.url = url.strip
+    self.url = url.strip rescue ''
   end
 
 end

Diff for: app/models/repository_protected_branche.rb

@@ -4,10 +4,11 @@ class RepositoryProtectedBranche < ActiveRecord::Base
   VALID_PERMS  = [ "RW+", "RW" ]
   DEFAULT_PERM = "RW+"
 
-  attr_accessible :path, :permissions, :position, :user_list
-
   acts_as_list
 
+  ## Attributes
+  attr_accessible :path, :permissions, :position, :user_list
+
   ## Relations
   belongs_to :repository
 
@@ -64,7 +65,7 @@ def update_permissions
 
 
   def remove_blank_items
-    self.user_list = user_list.select{ |user| !user.blank? }
+    self.user_list = user_list.select{ |user| !user.blank? } rescue []
   end
 
 end