From 7bbd091fb1e50aee93089d78857faf10bd6b580e Mon Sep 17 00:00:00 2001 From: Sam Ford <1584702+samford@users.noreply.github.com> Date: Wed, 13 Jan 2021 09:30:50 -0500 Subject: [PATCH] Livecheck: Use let instead of constants in tests --- .../Homebrew/test/livecheck/livecheck_spec.rb | 52 +++++++++---------- Library/Homebrew/test/livecheck_spec.rb | 21 ++++---- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/Library/Homebrew/test/livecheck/livecheck_spec.rb b/Library/Homebrew/test/livecheck/livecheck_spec.rb index 13e6da3165..cf9313880b 100644 --- a/Library/Homebrew/test/livecheck/livecheck_spec.rb +++ b/Library/Homebrew/test/livecheck/livecheck_spec.rb @@ -6,21 +6,21 @@ require "livecheck/livecheck" describe Homebrew::Livecheck do subject(:livecheck) { described_class } - CASK_URL = "https://brew.sh/test-0.0.1.dmg" - HEAD_URL = "https://github.com/Homebrew/brew.git" - HOMEPAGE_URL = "https://brew.sh" - LIVECHECK_URL = "https://formulae.brew.sh/api/formula/ruby.json" - STABLE_URL = "https://brew.sh/test-0.0.1.tgz" + let(:cask_url) { "https://brew.sh/test-0.0.1.dmg" } + let(:head_url) { "https://github.com/Homebrew/brew.git" } + let(:homepage_url) { "https://brew.sh" } + let(:livecheck_url) { "https://formulae.brew.sh/api/formula/ruby.json" } + let(:stable_url) { "https://brew.sh/test-0.0.1.tgz" } let(:f) do formula("test") do desc "Test formula" - homepage HOMEPAGE_URL - url STABLE_URL - head HEAD_URL + homepage "https://brew.sh" + url "https://brew.sh/test-0.0.1.tgz" + head "https://github.com/Homebrew/brew.git" livecheck do - url LIVECHECK_URL + url "https://formulae.brew.sh/api/formula/ruby.json" regex(/"stable":"(\d+(?:\.\d+)+)"/i) end end @@ -31,13 +31,13 @@ describe Homebrew::Livecheck do cask "test" do version "0.0.1,2" - url CASK_URL + url "https://brew.sh/test-0.0.1.dmg" name "Test" desc "Test cask" - homepage HOMEPAGE_URL + homepage "https://brew.sh" livecheck do - url LIVECHECK_URL + url "https://formulae.brew.sh/api/formula/ruby.json" regex(/"stable":"(\d+(?:\.\d+)+)"/i) end end @@ -82,9 +82,9 @@ describe Homebrew::Livecheck do let(:f_livecheck_url) do formula("test_livecheck_url") do desc "Test Livecheck URL formula" - homepage HOMEPAGE_URL - url STABLE_URL - head HEAD_URL + homepage "https://brew.sh" + url "https://brew.sh/test-0.0.1.tgz" + head "https://github.com/Homebrew/brew.git" end end @@ -93,34 +93,34 @@ describe Homebrew::Livecheck do cask "test_livecheck_url" do version "0.0.1,2" - url CASK_URL + url "https://brew.sh/test-0.0.1.dmg" name "Test" desc "Test Livecheck URL cask" - homepage HOMEPAGE_URL + homepage "https://brew.sh" end RUBY end it "returns a URL string when given a livecheck_url string" do - f_livecheck_url.livecheck.url(LIVECHECK_URL) - expect(livecheck.livecheck_url_to_string(LIVECHECK_URL, f_livecheck_url)).to eq(LIVECHECK_URL) + f_livecheck_url.livecheck.url(livecheck_url) + expect(livecheck.livecheck_url_to_string(livecheck_url, f_livecheck_url)).to eq(livecheck_url) end it "returns a URL symbol when given a valid livecheck_url symbol" do f_livecheck_url.livecheck.url(:head) - expect(livecheck.livecheck_url_to_string(HEAD_URL, f_livecheck_url)).to eq(HEAD_URL) + expect(livecheck.livecheck_url_to_string(head_url, f_livecheck_url)).to eq(head_url) f_livecheck_url.livecheck.url(:homepage) - expect(livecheck.livecheck_url_to_string(HOMEPAGE_URL, f_livecheck_url)).to eq(HOMEPAGE_URL) + expect(livecheck.livecheck_url_to_string(homepage_url, f_livecheck_url)).to eq(homepage_url) c_livecheck_url.livecheck.url(:homepage) - expect(livecheck.livecheck_url_to_string(HOMEPAGE_URL, c_livecheck_url)).to eq(HOMEPAGE_URL) + expect(livecheck.livecheck_url_to_string(homepage_url, c_livecheck_url)).to eq(homepage_url) f_livecheck_url.livecheck.url(:stable) - expect(livecheck.livecheck_url_to_string(STABLE_URL, f_livecheck_url)).to eq(STABLE_URL) + expect(livecheck.livecheck_url_to_string(stable_url, f_livecheck_url)).to eq(stable_url) c_livecheck_url.livecheck.url(:url) - expect(livecheck.livecheck_url_to_string(CASK_URL, c_livecheck_url)).to eq(CASK_URL) + expect(livecheck.livecheck_url_to_string(cask_url, c_livecheck_url)).to eq(cask_url) end it "returns nil when not given a string or valid symbol" do @@ -133,8 +133,8 @@ describe Homebrew::Livecheck do describe "::checkable_urls" do it "returns the list of URLs to check" do - expect(livecheck.checkable_urls(f)).to eq([HEAD_URL, STABLE_URL, HOMEPAGE_URL]) - expect(livecheck.checkable_urls(c)).to eq([CASK_URL, HOMEPAGE_URL]) + expect(livecheck.checkable_urls(f)).to eq([head_url, stable_url, homepage_url]) + expect(livecheck.checkable_urls(c)).to eq([cask_url, homepage_url]) end end diff --git a/Library/Homebrew/test/livecheck_spec.rb b/Library/Homebrew/test/livecheck_spec.rb index dd7bb7e20c..4e36665534 100644 --- a/Library/Homebrew/test/livecheck_spec.rb +++ b/Library/Homebrew/test/livecheck_spec.rb @@ -5,16 +5,11 @@ require "formula" require "livecheck" describe Livecheck do - HOMEPAGE_URL = "https://example.com/" - STABLE_URL = "https://example.com/example-1.2.3.tar.gz" - HEAD_URL = "https://example.com/example.git" - CASK_URL = "https://example.com/example-1.2.3.dmg" - let(:f) do formula do - homepage HOMEPAGE_URL - url STABLE_URL - head HEAD_URL + homepage "https://brew.sh" + url "https://brew.sh/test-0.0.1.tgz" + head "https://github.com/Homebrew/brew.git" end end let(:livecheckable_f) { described_class.new(f) } @@ -24,10 +19,10 @@ describe Livecheck do cask "test" do version "0.0.1,2" - url CASK_URL + url "https://brew.sh/test-0.0.1.dmg" name "Test" desc "Test cask" - homepage HOMEPAGE_URL + homepage "https://brew.sh" end RUBY end @@ -97,13 +92,15 @@ describe Livecheck do end describe "#url" do + let(:url_string) { "https://brew.sh" } + it "returns nil if not set" do expect(livecheckable_f.url).to be nil end it "returns a string when set to a string" do - livecheckable_f.url("https://brew.sh") - expect(livecheckable_f.url).to eq("https://brew.sh") + livecheckable_f.url(url_string) + expect(livecheckable_f.url).to eq(url_string) end it "returns the URL symbol if valid" do