Commit 981a3442 authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Merge pull request #888 from jasonkarns/test-assertions 

Leverage assert_success helper
parents a9374181 9ff6402e

test/cache.bats

+10 −5
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ setup() { 
  stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"



  install_fixture definitions/without-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]



  unstub curl
@@ -29,7 +30,8 @@ setup() { 
  cp "${FIXTURE_ROOT}/package-1.0.0.tar.gz" "$RUBY_BUILD_CACHE_PATH"



  install_fixture definitions/without-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]



  unstub curl
@@ -44,7 +46,8 @@ setup() { 
  cp "${FIXTURE_ROOT}/package-1.0.0.tar.gz" "$RUBY_BUILD_CACHE_PATH"



  install_fixture definitions/with-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]
@@ -64,7 +67,8 @@ setup() { 
  touch "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz"



  install_fixture definitions/with-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]

  diff -q "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" "${FIXTURE_ROOT}/package-1.0.0.tar.gz"
@@ -81,7 +85,8 @@ setup() { 
  export RUBY_BUILD_CACHE_PATH="${TMP}/nonexistent"



  install_fixture definitions/without-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  [ ! -d "$RUBY_BUILD_CACHE_PATH" ]

test/checksum.bats

+12 −6
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ export RUBY_BUILD_CACHE_PATH= 
  stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"



  install_fixture definitions/with-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -36,7 +37,8 @@ export RUBY_BUILD_CACHE_PATH= 
  stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"



  install_fixture definitions/with-invalid-checksum

  [ "$status" -eq 1 ]



  assert_failure

  [ ! -f "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -49,7 +51,8 @@ export RUBY_BUILD_CACHE_PATH= 
  stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"



  install_fixture definitions/with-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -62,7 +65,8 @@ export RUBY_BUILD_CACHE_PATH= 
  stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"



  install_fixture definitions/with-md5-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -75,7 +79,8 @@ export RUBY_BUILD_CACHE_PATH= 
  stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"



  install_fixture definitions/with-md5-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -88,7 +93,8 @@ export RUBY_BUILD_CACHE_PATH= 
  stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"



  install_fixture definitions/with-checksum

  [ "$status" -eq 1 ]



  assert_failure

  [ ! -f "${INSTALL_ROOT}/bin/package" ]



  unstub curl

test/mirror.bats

+13 −6
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ export RUBY_BUILD_MIRROR_URL=http://mirror.example.com 


  install_fixture definitions/without-checksum

  echo "$output" >&2

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -25,7 +26,8 @@ export RUBY_BUILD_MIRROR_URL=http://mirror.example.com 
  stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"



  install_fixture definitions/with-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -42,7 +44,8 @@ export RUBY_BUILD_MIRROR_URL=http://mirror.example.com 
    "-q -o * -*S* $mirror_url : cp $FIXTURE_ROOT/package-1.0.0.tar.gz \$3"



  install_fixture definitions/with-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -59,7 +62,8 @@ export RUBY_BUILD_MIRROR_URL=http://mirror.example.com 
    "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"



  install_fixture definitions/with-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -78,7 +82,8 @@ export RUBY_BUILD_MIRROR_URL=http://mirror.example.com 


  install_fixture definitions/with-checksum

  echo "$output" >&2

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -95,7 +100,8 @@ export RUBY_BUILD_MIRROR_URL=http://mirror.example.com 
    "-q -o * -*S* https://?*/$checksum : cp $FIXTURE_ROOT/package-1.0.0.tar.gz \$3" \



  install_fixture definitions/with-checksum

  [ "$status" -eq 0 ]



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl
@@ -113,6 +119,7 @@ export RUBY_BUILD_MIRROR_URL=http://mirror.example.com 
  run_inline_definition <<DEF

install_package "package-1.0.0" "https://cache.ruby-lang.org/packages/package-1.0.0.tar.gz#ba988b1bb4250dee0b9dd3d4d722f9c64b2bacfc805d1b6eba7426bda72dd3c5" copy

DEF



  assert_success

  assert [ -x "${INSTALL_ROOT}/bin/package" ]