parent
							
								
									afeb2dd98e
								
							
						
					
					
						commit
						20f4815ebf
					
				|  | @ -39,8 +39,7 @@ class Repository | ||||||
|                       changelog license_blob license_key gitignore |                       changelog license_blob license_key gitignore | ||||||
|                       gitlab_ci_yml branch_names tag_names branch_count |                       gitlab_ci_yml branch_names tag_names branch_count | ||||||
|                       tag_count avatar exists? root_ref has_visible_content? |                       tag_count avatar exists? root_ref has_visible_content? | ||||||
|                       issue_template_names merge_request_template_names xcode_project? |                       issue_template_names merge_request_template_names xcode_project?).freeze | ||||||
|                       insights_config).freeze |  | ||||||
| 
 | 
 | ||||||
|   # Methods that use cache_method but only memoize the value |   # Methods that use cache_method but only memoize the value | ||||||
|   MEMOIZED_CACHED_METHODS = %i(license).freeze |   MEMOIZED_CACHED_METHODS = %i(license).freeze | ||||||
|  | @ -58,8 +57,7 @@ class Repository | ||||||
|     avatar: :avatar, |     avatar: :avatar, | ||||||
|     issue_template: :issue_template_names, |     issue_template: :issue_template_names, | ||||||
|     merge_request_template: :merge_request_template_names, |     merge_request_template: :merge_request_template_names, | ||||||
|     xcode_config: :xcode_project?, |     xcode_config: :xcode_project? | ||||||
|     insights_config: :insights_config |  | ||||||
|   }.freeze |   }.freeze | ||||||
| 
 | 
 | ||||||
|   def initialize(full_path, project, disk_path: nil, is_wiki: false) |   def initialize(full_path, project, disk_path: nil, is_wiki: false) | ||||||
|  | @ -665,11 +663,6 @@ class Repository | ||||||
|   end |   end | ||||||
|   cache_method :xcode_project? |   cache_method :xcode_project? | ||||||
| 
 | 
 | ||||||
|   def insights_config |  | ||||||
|     file_on_head(:insights_config) |  | ||||||
|   end |  | ||||||
|   cache_method :insights_config |  | ||||||
| 
 |  | ||||||
|   def head_commit |   def head_commit | ||||||
|     @head_commit ||= commit(self.root_ref) |     @head_commit ||= commit(self.root_ref) | ||||||
|   end |   end | ||||||
|  |  | ||||||
|  | @ -22,7 +22,6 @@ module Gitlab | ||||||
|       gitignore: '.gitignore', |       gitignore: '.gitignore', | ||||||
|       gitlab_ci: '.gitlab-ci.yml', |       gitlab_ci: '.gitlab-ci.yml', | ||||||
|       route_map: '.gitlab/route-map.yml', |       route_map: '.gitlab/route-map.yml', | ||||||
|       insights_config: '.gitlab/insights.yml', |  | ||||||
| 
 | 
 | ||||||
|       # Dependency files |       # Dependency files | ||||||
|       cartfile: %r{\ACartfile[^/]*\z}, |       cartfile: %r{\ACartfile[^/]*\z}, | ||||||
|  |  | ||||||
|  | @ -77,10 +77,6 @@ describe Gitlab::FileDetector do | ||||||
|       expect(described_class.type_of('.gitlab/merge_request_templates/foo.md')).to eq(:merge_request_template) |       expect(described_class.type_of('.gitlab/merge_request_templates/foo.md')).to eq(:merge_request_template) | ||||||
|     end |     end | ||||||
| 
 | 
 | ||||||
|     it 'returns the type of an Insights config file' do |  | ||||||
|       expect(described_class.type_of('.gitlab/insights.yml')).to eq(:insights_config) |  | ||||||
|     end |  | ||||||
| 
 |  | ||||||
|     it 'returns nil for an unknown file' do |     it 'returns nil for an unknown file' do | ||||||
|       expect(described_class.type_of('foo.txt')).to be_nil |       expect(described_class.type_of('foo.txt')).to be_nil | ||||||
|     end |     end | ||||||
|  |  | ||||||
|  | @ -1616,8 +1616,7 @@ describe Repository do | ||||||
|         :has_visible_content?, |         :has_visible_content?, | ||||||
|         :issue_template_names, |         :issue_template_names, | ||||||
|         :merge_request_template_names, |         :merge_request_template_names, | ||||||
|         :xcode_project?, |         :xcode_project? | ||||||
|         :insights_config |  | ||||||
|       ]) |       ]) | ||||||
| 
 | 
 | ||||||
|       repository.after_change_head |       repository.after_change_head | ||||||
|  | @ -1883,26 +1882,6 @@ describe Repository do | ||||||
|     end |     end | ||||||
|   end |   end | ||||||
| 
 | 
 | ||||||
|   describe "#insights_config", :use_clean_rails_memory_store_caching do |  | ||||||
|     it 'returns a valid Insights config file' do |  | ||||||
|       files = [TestBlob.new('file'), TestBlob.new('.gitlab/insights.yml')] |  | ||||||
| 
 |  | ||||||
|       expect(repository.tree).to receive(:blobs).and_return(files) |  | ||||||
|       expect(repository.insights_config.path).to eq('.gitlab/insights.yml') |  | ||||||
|     end |  | ||||||
| 
 |  | ||||||
|     it 'returns nil if does not exist' do |  | ||||||
|       expect(repository.tree).to receive(:blobs).and_return([]) |  | ||||||
|       expect(repository.insights_config).to be_nil |  | ||||||
|     end |  | ||||||
| 
 |  | ||||||
|     it 'returns nil for an empty repository' do |  | ||||||
|       allow(repository).to receive(:root_ref).and_raise(Gitlab::Git::Repository::NoRepository) |  | ||||||
| 
 |  | ||||||
|       expect(repository.insights_config).to be_nil |  | ||||||
|     end |  | ||||||
|   end |  | ||||||
| 
 |  | ||||||
|   describe "#keep_around" do |   describe "#keep_around" do | ||||||
|     it "does not fail if we attempt to reference bad commit" do |     it "does not fail if we attempt to reference bad commit" do | ||||||
|       expect(repository.kept_around?('abc1234')).to be_falsey |       expect(repository.kept_around?('abc1234')).to be_falsey | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue