admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Tidy up Sparkle tests a bit

Browse Source
This commit is contained in:
Sam Ford 2022-06-02 10:36:33 -04:00
parent c6907f911f
commit 71906c7f89
No known key found for this signature in database
GPG Key ID: 7AF5CBEE1DD6F76D
1 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Library/Homebrew/test/livecheck/strategy/sparkle_spec.rb
View File

@ -52,7 +52,15 @@ describe Homebrew::Livecheck::Strategy::Sparkle do
</item>
EOS
appcast_xml = <<~EOS
items_to_omit = <<~EOS
#{first_item.sub(%r{<(enclosure[^>]+?)\s*?/>}, '<\1 os="not-osx" />')}
#{first_item.sub(/(<sparkle:minimumSystemVersion>)[^<]+?</m, '\1100<')}
#{first_item.sub(/(<sparkle:minimumSystemVersion>)[^<]+?</m, '\19000<')}
<item>
</item>
EOS
appcast = <<~EOS
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
<channel>
@ -66,16 +74,8 @@ describe Homebrew::Livecheck::Strategy::Sparkle do
</rss>
EOS
extra_items = <<~EOS
#{first_item.sub(%r{<(enclosure[^>]+?)\s*?/>}, '<\1 os="not-osx" />')}
#{first_item.sub(/(<sparkle:minimumSystemVersion>)[^<]+?</m, '\1100<')}
#{first_item.sub(/(<sparkle:minimumSystemVersion>)[^<]+?</m, '\19000<')}
<item>
</item>
EOS
appcast_with_omitted_items = appcast_xml.sub("</item>", "</item>\n#{extra_items}")
beta_channel_item = appcast_xml.sub(
omitted_items = appcast.sub("</item>", "</item>\n#{items_to_omit}")
beta_channel_item = appcast.sub(
first_item,
first_item.sub(
"</title",
@ -83,23 +83,23 @@ describe Homebrew::Livecheck::Strategy::Sparkle do
),
)
no_versions_item =
appcast_xml
appcast
.sub(second_item, "")
.gsub(/sparkle:(shortVersionString|version)="[^"]+?"\s*/, "")
.sub(
"<title>#{item_hash[0][:title]}</title>",
"<title>Version</title>",
)
no_items = appcast_xml.sub(%r{<item>.+</item>}m, "")
undefined_namespace_xml = appcast_xml.sub(/\s*xmlns:sparkle="[^"]+?"/, "")
no_items = appcast.sub(%r{<item>.+</item>}m, "")
undefined_namespace = appcast.sub(/\s*xmlns:sparkle="[^"]+?"/, "")
{
appcast: appcast_xml,
appcast_with_omitted_items: appcast_with_omitted_items,
beta_channel_item: beta_channel_item,
no_versions_item: no_versions_item,
no_items: no_items,
undefined_namespace: undefined_namespace_xml,
appcast: appcast,
omitted_items: omitted_items,
beta_channel_item: beta_channel_item,
no_versions_item: no_versions_item,
no_items: no_items,
undefined_namespace: undefined_namespace,
}
}
@ -107,7 +107,7 @@ describe Homebrew::Livecheck::Strategy::Sparkle do
let(:items) {
items = {
appcast: [
appcast: [
Homebrew::Livecheck::Strategy::Sparkle::Item.new(
title: item_hash[0][:title],
pub_date: Time.parse(item_hash[0][:pub_date]),
@ -121,20 +121,17 @@ describe Homebrew::Livecheck::Strategy::Sparkle do
bundle_version: Homebrew::BundleVersion.new(item_hash[1][:short_version], item_hash[1][:version]),
),
],
no_versions_item: [
Homebrew::Livecheck::Strategy::Sparkle::Item.new(
title: "Version",
pub_date: Time.parse(item_hash[0][:pub_date]),
url: item_hash[0][:url],
bundle_version: nil,
),
],
}
beta_channel_item = items[:appcast][0].clone
beta_channel_item.channel = "beta"
items[:beta_channel_item] = [beta_channel_item, items[:appcast][1].clone]
no_versions_item = items[:appcast][0].clone
no_versions_item.title = "Version"
no_versions_item.bundle_version = nil
items[:no_versions_item] = [no_versions_item]
items
}
@ -151,15 +148,15 @@ describe Homebrew::Livecheck::Strategy::Sparkle do
end
describe "::items_from_content" do
let(:items_from_appcast_xml) { sparkle.items_from_content(xml[:appcast]) }
let(:first_item) { items_from_appcast_xml[0] }
let(:items_from_appcast) { sparkle.items_from_content(xml[:appcast]) }
let(:first_item) { items_from_appcast[0] }
it "returns nil if content is blank" do
expect(sparkle.items_from_content("")).to eq([])
end
it "returns an array of Items when given XML data" do
expect(items_from_appcast_xml).to eq(items[:appcast])
expect(items_from_appcast).to eq(items[:appcast])
expect(first_item.title).to eq(item_hash[0][:title])
expect(first_item.pub_date).to eq(Time.parse(item_hash[0][:pub_date]))
expect(first_item.url).to eq(item_hash[0][:url])
@ -176,7 +173,7 @@ describe Homebrew::Livecheck::Strategy::Sparkle do
it "returns an array of version strings when given content" do
expect(sparkle.versions_from_content(xml[:appcast])).to eq(versions)
expect(sparkle.versions_from_content(xml[:appcast_with_omitted_items])).to eq(versions)
expect(sparkle.versions_from_content(xml[:omitted_items])).to eq(versions)
expect(sparkle.versions_from_content(xml[:beta_channel_item])).to eq(versions)
expect(sparkle.versions_from_content(xml[:no_versions_item])).to eq([])
expect(sparkle.versions_from_content(xml[:undefined_namespace])).to eq(versions)
@ -214,7 +211,7 @@ describe Homebrew::Livecheck::Strategy::Sparkle do
sparkle.versions_from_content(xml[:appcast], title_regex) do |item, regex|
item.title[regex, 1]
end,
).to eq([items[:appcast][0].short_version])
).to eq([item_hash[0][:short_version]])
expect(
sparkle.versions_from_content(xml[:appcast], title_regex) do |items, regex|
@ -225,18 +222,18 @@ describe Homebrew::Livecheck::Strategy::Sparkle do
"#{match[1]},#{item.version}"
end,
).to eq(["#{items[:appcast][0].short_version},#{items[:appcast][0].version}"])
).to eq(["#{item_hash[0][:short_version]},#{item_hash[0][:version]}"])
# Returning an array of strings from the block
expect(
sparkle.versions_from_content(xml[:appcast], title_regex) do |item, regex|
[item.title[regex, 1]]
end,
).to eq([items[:appcast][0].short_version])
).to eq([item_hash[0][:short_version]])
expect(
sparkle.versions_from_content(xml[:appcast], &:short_version),
).to eq([items[:appcast][0].short_version])
).to eq([item_hash[0][:short_version]])
expect(
sparkle.versions_from_content(xml[:appcast], title_regex) do |items, regex|