Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-07 16:15:32 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-07 16:15:32 +0300
commitca05ea6b732cad9d7b9d809f6b66ba4fca904857 (patch)
tree3ae1d16af08e989a66e340214b6ea95da237a812 /spec
parent59376bb3604924fd9e91311eab24ab6454363cfa (diff)
Remove knapsack_merger since we don't use it anyway
Diffstat (limited to 'spec')
-rw-r--r--spec/knapsack_merger.rb41
-rw-r--r--spec/spec_helper.rb1
2 files changed, 0 insertions, 42 deletions
diff --git a/spec/knapsack_merger.rb b/spec/knapsack_merger.rb
deleted file mode 100644
index c6bcefe8464..00000000000
--- a/spec/knapsack_merger.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-begin
- class Knapsack::Report
- alias_method :save_without_leading_existing_report, :save
-
- def load_existing_report
- Knapsack::Presenter.existing_report = open
- rescue
- false
- end
-
- def save
- load_existing_report
- save_without_leading_existing_report
- end
- end
-
- class << Knapsack::Presenter
- attr_accessor :existing_report
-
- def initialize
- @existing_report = []
- end
-
- def report_hash
- return current_report_hash unless existing_report
- existing_report.merge(current_report_hash).sort.to_h
- end
-
- def current_report_hash
- Knapsack.tracker.test_files_with_time
- end
-
- def report_yml
- report_hash.to_yaml
- end
-
- def report_json
- JSON.pretty_generate(report_hash)
- end
- end
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 84b9ee75f6a..a20f4c05971 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -16,7 +16,6 @@ require 'shoulda/matchers'
require 'sidekiq/testing/inline'
require 'rspec/retry'
require 'knapsack'
-require_relative 'knapsack_merger'
Knapsack::Adapters::RSpecAdapter.bind