Skip to content

Commit

Permalink
Merge pull request #3541 from rolandwalker/testsuite_checksums
Browse files Browse the repository at this point in the history
update test suite to use sha256
  • Loading branch information
rolandwalker committed Mar 15, 2014
2 parents 89d90d7 + 8151685 commit c6ea492
Show file tree
Hide file tree
Showing 37 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion test/cask/artifact/alt_target_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
link 'subdir/Caffeine.app', :target => 'AnotherName.app'
end

Expand Down
2 changes: 1 addition & 1 deletion test/cask/artifact/app_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
link 'subdir/Caffeine.app'
end

Expand Down
2 changes: 1 addition & 1 deletion test/cask/artifact/two_links_correct_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
link 'subdir/Caffeine.app'
link 'subdir/Caffeine.app', :target => 'AnotherName.app'
end
Expand Down
4 changes: 2 additions & 2 deletions test/cask/audit_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class CaskSourceForgeOtherCorrectURLFormat < Cask

class CaskVersionLatestWithChecksum < Cask
version 'latest'
sha1 '123456'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
end

describe Cask::Audit do
Expand Down Expand Up @@ -79,7 +79,7 @@ class CaskVersionLatestWithChecksum < Cask
audit.errors.must_include 'homepage is required'
end

it "adds an error if version is latest and using sha1" do
it "adds an error if version is latest and using sha256" do
audit = Cask::Audit.new(CaskVersionLatestWithChecksum.new)
audit.run!
audit.errors.must_include 'you should use no_checksum when version is latest'
Expand Down
2 changes: 1 addition & 1 deletion test/cask/installer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
}.must_raise(ChecksumMissingError)
end

it "installs fine if no_checksum is included in cask" do
it "installs fine if sha256 :no_check is used" do
no_checksum = Cask.load('no-checksum')
shutup do
Cask::Installer.new(no_checksum).install
Expand Down
2 changes: 1 addition & 1 deletion test/support/Casks/adobe-air-container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class AdobeAirContainer < TestCask
url TestHelper.local_binary('GMDesk-1.01.air')
homepage 'http://robertnyman.com/gmdesk/'
version '1.0.1'
sha1 'bac991477091d3a437072313293945a753fd1bcd'
sha256 '9b6e4174afa76f2af50238364fcf87525bc4ed2287acbe62925107ab6cda5c99'
link 'GMDesk.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/bad-checksum.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class BadChecksum < TestCask
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'badbadbadbadbadbadbadbadbadbad'
sha256 'badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb'
link 'Caffeine.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/basic-cask.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class BasicCask < TestCask
url 'http://example.com/TestCask.dmg'
homepage 'http://example.com/'
version '1.2.3'
sha1 '0123456789012345678901234567890123456789'
sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
link 'TestCask.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/bzipped-asset.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class BzippedAsset < TestCask
url TestHelper.local_binary('bzipped_asset.bz2')
homepage 'http://example.com/bzipped-asset'
version '1.2.3'
sha1 '4df7da42ddbf4256d8ba8eb6127f89f9dab47654'
sha256 'eaf67b3a62cb9275f96e45d05c70b94bef9ef1dae344083e93eda6b0b388a61c'
link 'bzipped-asset-1.2.3'
end
2 changes: 1 addition & 1 deletion test/support/Casks/cab-container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class CabContainer < TestCask
url TestHelper.local_binary('cabcontainer.cab')
homepage 'http://example.com/cab-container'
version '1.2.3'
sha1 '85bfbcfc8887a995ae0e724796a0c242341b3071'
sha256 '192d0cf6b727473f9ba0f55cec793ee2a8f7113c5cfe9d49e05a087436c5efe2'
depends_on_formula 'cabextract'
link 'cabcontainer/Application.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/invalid/invalid-checksum-conflict1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class InvalidChecksumConflict1 < TestCask
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
no_checksum
link 'Caffeine.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/invalid/invalid-checksum-conflict2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ class InvalidChecksumConflict2 < TestCask
homepage 'http://example.com/local-caffeine'
version '1.2.3'
no_checksum
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
link 'Caffeine.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/invalid/invalid-two-homepage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class InvalidTwoHomepage < TestCask
homepage 'http://example.com/local-caffeine'
homepage 'http://www.example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'

link 'Caffeine.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/invalid/invalid-two-url.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class InvalidTwoUrl < TestCask
url 'http://example.com/caffeine.zip'
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'

link 'Caffeine.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/invalid/invalid-two-version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class InvalidTwoVersion < TestCask
homepage 'http://example.com/local-caffeine'
version '1.2.3'
version '2.0'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'

link 'Caffeine.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/local-caffeine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class LocalCaffeine < TestCask
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'

link 'Caffeine.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/local-transmission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class LocalTransmission < TestCask
url TestHelper.local_binary('transmission-2.61.dmg')
homepage 'http://example.com/local-transmission'
version '2.61'
sha1 'ac6cf624c3a4a3b1a692e95fa8de672b8be43391'
sha256 'd26d7481cf1229f879c05e11cbdf440d99db6d6342f26c73d8ba7861b975532f'
link 'Transmission.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/naked-executable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class NakedExecutable < TestCask
url TestHelper.local_binary('naked_executable')
homepage 'http://example.com/naked-executable'
version '1.2.3'
sha1 '504519c842b7202250315ef562069e4ce10da99c'
sha256 '306c6ca7407560340797866e077e053627ad409277d1b9da58106fce4cf717cb'
container_type :naked
end
2 changes: 1 addition & 1 deletion test/support/Casks/naked-pkg.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ class NakedPkg < TestCask
url TestHelper.local_binary('Naked.pkg')
homepage 'http://example.com/naked-pkg'
version '1.2.3'
sha1 '65fdec6f56edeb8662f7440908df7a986262f441'
sha256 '77c9249a2f9345686305a9b8a15cebac542c5ad211797e4ed950c111ff05c36e'
end
2 changes: 1 addition & 1 deletion test/support/Casks/nested-app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class NestedApp < TestCask
url TestHelper.local_binary('NestedApp.dmg.zip')
homepage 'http://example.com/nested-app'
version '1.2.3'
sha1 'de226f9ced77ae359ddb3c8764c605a391199d5c'
sha256 '1866dfa833b123bb8fe7fa7185ebf24d28d300d0643d75798bc23730af734216'
nested_container 'NestedApp.dmg'
link 'MyNestedApp.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/no-checksum.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class NoChecksum < TestCask
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
no_checksum
sha256 :no_check
link 'Caffeine.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/rar-container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class RarContainer < TestCask
url TestHelper.local_binary('rarcontainer.rar')
homepage 'http://example.com/rar-container'
version '1.2.3'
sha1 '8635d0fd1a62f51102784fb38be428eda1e0df26'
sha256 '35fb13fb13e6aefc38b60486627eff6b6b55b2f99f64bf47938530c6cf9e0a0f'
depends_on_formula 'unar'
link 'rarcontainer/Application.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/sevenzip-container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class SevenzipContainer < TestCask
url TestHelper.local_binary('sevenzipcontainer.7z')
homepage 'http://example.com/sevenzip-container'
version '1.2.3'
sha1 '469d33b6e499096c325af907b05c4f37274ca3fb'
sha256 '1550701e7848fcb94f5b0085cca527083a8662ddeb8c0a7bc5af6bd145797cc1'
depends_on_formula 'unar'
link 'sevenzipcontainer/Application.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/stuffit-container.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class StuffitContainer < TestCask
url TestHelper.local_binary('sheldonmac.sit')
homepage 'http://www.tobias-jung.de/seekingprofont/'
version '1.2.3'
sha1 'cf511e0c1a11be9e10bbbf3e5c084e54c545e019'
sha256 '892b6d49a98c546381d41dec9b0bbc04267ac008d72b99755968d357099993b7'
depends_on_formula 'unar'
link 'sheldonmac/v1.0'
end
2 changes: 1 addition & 1 deletion test/support/Casks/svn-download-cask.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class SvnDownloadCask < TestCask
url 'http://example.com/trunk/projectdir/subdir', :using => :svn
homepage 'http://example.com/'
version '1.2.3'
sha1 '9fbff30e151d9e662ed30acf51f1d374d3282ea0'
sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
link 'TestCask.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/svn-download-check-cask.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class SvnDownloadCheckCask < TestCask
url 'http://example.com/trunk/projectdir/subdir', :using => :svn
homepage 'http://example.com/'
version '1.2.3'
sha1 '9fbff30e151d9e662ed30acf51f1d374d3282ea0'
sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
link 'TestCask.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/svn-download-revision-cask.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class SvnDownloadRevisionCask < TestCask
url 'http://example.com/trunk/projectdir/subdir', :using => :svn, :revision => '10'
homepage 'http://example.com/'
version '1.2.3'
sha1 '9fbff30e151d9e662ed30acf51f1d374d3282ea0'
sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
link 'TestCask.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/svn-download-trust-cask.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class SvnDownloadTrustCask < TestCask
url 'http://example.com/trunk/projectdir/subdir', :using => :svn, :trust_cert => true
homepage 'http://example.com/'
version '1.2.3'
sha1 '9fbff30e151d9e662ed30acf51f1d374d3282ea0'
sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
link 'TestCask.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/tarball.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class Tarball < TestCask
url TestHelper.local_binary('tarball.tgz')
homepage 'http://example.com/tarball'
version '1.2.3'
no_checksum
sha256 :no_check
link 'Tarball.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/test-opera.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class TestOpera < TestCask
url 'http://get.geo.opera.com/pub/opera/desktop/19.0.1326.47/mac/Opera_19.0.1326.47_Setup.dmg'
homepage 'http://www.opera.com/'
version '19.0.1326.47'
sha1 '9732e4c26c62f3ce3f6b0b46a32cb699d45e9230'
sha256 '7b91f20ab754f7b3fef8dc346e0393917e11676b74c8f577408841619f76040a'
link 'Opera.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/with-alt-target.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class WithAltTarget < TestCask
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
link 'Caffeine.app', :target => 'AnotherName.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/with-binary.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class WithBinary < TestCask
url TestHelper.local_binary('AppWithBinary.zip')
sha1 '72de271c9215732374dff1c91a58e1205f116d0d'
homepage 'http://example.com/with-binary'
sha256 'd5b2dfbef7ea28c25f7a77cd7fa14d013d82b626db1d82e00e25822464ba19e2'
version '1.2.3'
link 'App.app'
binary 'binary'
Expand Down
2 changes: 1 addition & 1 deletion test/support/Casks/with-caveats.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class WithCaveats < TestCask
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
link 'Caffeine.app'
# simple string is evaluated at compile-time
caveats <<-EOS.undent
Expand Down
2 changes: 1 addition & 1 deletion test/support/Casks/with-installable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class WithInstallable < TestCask
url TestHelper.local_binary('MyFancyPkg.zip')
homepage 'http://example.com/fancy-pkg'
version '1.2.3'
sha1 '8588bd8175a54b8e0a1310cc18e6567d520ab7c4'
sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
install 'MyFancyPkg/Fancy.pkg'
uninstall :script => { :executable => 'MyFancyPkg/FancyUninstaller.tool', :args => %w[--please] },
:quit => 'my.fancy.package.app'
Expand Down
2 changes: 1 addition & 1 deletion test/support/Casks/with-pkgutil-uninstall.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class WithPkgutilUninstall < TestCask
url TestHelper.local_binary('MyFancyPkg.zip')
homepage 'http://example.com/fancy-pkg'
version '1.2.3'
sha1 '8588bd8175a54b8e0a1310cc18e6567d520ab7c4'
sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
install 'Fancy.pkg'
uninstall :pkgutil => 'my.fancy.package.*',
:kext => 'my.fancy.package.kernelextension',
Expand Down
2 changes: 1 addition & 1 deletion test/support/Casks/with-two-links-correct.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class WithTwoLinksCorrect < TestCask
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
link 'Caffeine.app'
link 'Caffeine.app', :target => 'AnotherName.app'
end
2 changes: 1 addition & 1 deletion test/support/Casks/with-two-links-incorrect.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ class WithTwoLinksIncorrect < TestCask
url TestHelper.local_binary('caffeine.zip')
homepage 'http://example.com/local-caffeine'
version '1.2.3'
sha1 'd2fbdad1619934313026fc831e6c6e3dd97ac030'
sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
link 'Caffeine.app', 'Caffeine.app/Contents/MacOS/Caffeine'
end

0 comments on commit c6ea492

Please sign in to comment.