fix #245
This commit is contained in:
parent
c3867a89f1
commit
9b46d56a9e
|
@ -45,8 +45,8 @@ module GitHubChangelogGenerator
|
||||||
filtered_tags = all_tags
|
filtered_tags = all_tags
|
||||||
if @options[:between_tags]
|
if @options[:between_tags]
|
||||||
@options[:between_tags].each do |tag|
|
@options[:between_tags].each do |tag|
|
||||||
unless all_tags.include? tag
|
unless all_tags.map(&:name).include? tag
|
||||||
puts "Warning: can't find tag #{tag}, specified with --between-tags option.".yellow
|
Helper.log.warn "Warning: can't find tag #{tag}, specified with --between-tags option."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
filtered_tags = all_tags.select { |tag| @options[:between_tags].include? tag.name }
|
filtered_tags = all_tags.select { |tag| @options[:between_tags].include? tag.name }
|
||||||
|
@ -58,11 +58,11 @@ module GitHubChangelogGenerator
|
||||||
filtered_tags = all_tags
|
filtered_tags = all_tags
|
||||||
if @options[:exclude_tags]
|
if @options[:exclude_tags]
|
||||||
@options[:exclude_tags].each do |tag|
|
@options[:exclude_tags].each do |tag|
|
||||||
unless all_tags.include? tag
|
unless all_tags.map(&:name).include? tag
|
||||||
puts "Warning: can't find tag #{tag}, specified with --between-tags option.".yellow
|
Helper.log.warn "Warning: can't find tag #{tag}, specified with --exclude-tags option."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
filtered_tags = all_tags.reject { |tag| @options[:exclude_tags].include? tag }
|
filtered_tags = all_tags.reject { |tag| @options[:exclude_tags].include? tag.name }
|
||||||
end
|
end
|
||||||
filtered_tags
|
filtered_tags
|
||||||
end
|
end
|
||||||
|
|
|
@ -58,25 +58,23 @@ describe GitHubChangelogGenerator::Generator do
|
||||||
|
|
||||||
describe "#get_filtered_tags" do
|
describe "#get_filtered_tags" do
|
||||||
subject do
|
subject do
|
||||||
tags_mash = tags_mash_from_strings(%w(1 2 3 4 5))
|
generator.get_filtered_tags(tags_mash_from_strings(%w(1 2 3 4 5)))
|
||||||
generator.get_filtered_tags(tags_mash)
|
|
||||||
end
|
end
|
||||||
# before { generator.get_filtered_tags(%w(1 2 3 4 5)) }
|
|
||||||
|
|
||||||
context "with excluded and between tags" do
|
context "with excluded and between tags" do
|
||||||
let(:generator) { GitHubChangelogGenerator::Generator.new(between_tags: %w(1 2 3), exclude_tags: %w(2)) }
|
let(:generator) { GitHubChangelogGenerator::Generator.new(between_tags: %w(1 2 3), exclude_tags: %w(2)) }
|
||||||
it { is_expected.to be_a Array }
|
it { is_expected.to be_a Array }
|
||||||
it { is_expected.to match_array(%w(1 3)) }
|
it { is_expected.to match_array(tags_mash_from_strings(%w(1 3))) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "#filter_excluded_tags" do
|
describe "#filter_excluded_tags" do
|
||||||
subject { generator.filter_excluded_tags(%w(1 2 3)) }
|
subject { generator.filter_excluded_tags(tags_mash_from_strings(%w(1 2 3))) }
|
||||||
|
|
||||||
context "with valid excluded tags" do
|
context "with valid excluded tags" do
|
||||||
let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w(3)) }
|
let(:generator) { GitHubChangelogGenerator::Generator.new(exclude_tags: %w(3)) }
|
||||||
it { is_expected.to be_a Array }
|
it { is_expected.to be_a Array }
|
||||||
it { is_expected.to match_array(%w(1 2)) }
|
it { is_expected.to match_array(tags_mash_from_strings(%w(1 2))) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user