v3.0.1: fix ./run, webrick

Author: adamhooper

README.md

@@ -202,6 +202,18 @@ and other spots online. One detail sets us apart: we do _not_ use
 Changelog and Update Instructions
 =================================
 
+**3.0.1**, released 2020-04-09
+
+Changes:
+
+* Re-included "webrick", so specs can require it.
+* Re-included "xvfb-run", to fix ./run.
+* Nix "curl", which is unused.
+
+To upgrade:
+
+* Change `OVERVIEW_INTEGRATION_TESTER_VERSION` to `3.0.1`
+
 **3.0.0**, released 2020-04-08
 
 Changes:
@@ -216,6 +228,11 @@ To upgrade:
   `OVERVIEW_VERSION` to at least `a19aeed0cfcc2417a1ddc135f424ecf76748285b`
 * (To follow changes in `overview-server` project): set
   `DEVELOPMENT_PROJECT_NAME=overview-server`
+* Nix the `--shm-size` Docker flag from your `./run`.
+* If you modified your `run` script to invoke `xvfb-run`, remove the
+  `--init` Docker flag.
+* Overwrite your `run` by downloading
+  [run-browser @ v3.0.0](https://raw.githubusercontent.com/overview/overview-integration-tester/v3.0.0/skeleton/run-browser)
 * Overwrite your `run-browser` by downloading
   [run-browser @ v3.0.0](https://raw.githubusercontent.com/overview/overview-integration-tester/v3.0.0/skeleton/run-browser)
 * Overwrite your `spec/spec_helper.rb` with

docker/Dockerfile

@@ -1,17 +1,23 @@
 FROM alpine:3.11.5
 
+# ruby-json: generally useful
+# ruby-webrick: useful for tests to create plugin web servers
+# ruby-etc: required (but not depended on) by ruby-webrick
+# xvfb-run: used by ./run
+# x11vnc: used by ./run-browser
 RUN apk add --no-cache \
       ca-certificates \
       chromium \
       chromium-chromedriver \
-      curl \
       ruby \
+      ruby-etc \
       ruby-json \
       ruby-webrick \
       ttf-freefont \
       unzip \
       x11vnc \
       xvfb \
+      xvfb-run \
     && gem install bundler
 
 WORKDIR /app
@@ -20,8 +26,6 @@ COPY Gemfile Gemfile.lock all-tests /app/
 
 RUN apk add --no-cache --virtual build-deps \
       build-base \
-      ca-certificates \
-      curl \
       libxml2-dev \
       libxslt-dev \
       ruby-dev \

skeleton/run

@@ -5,10 +5,11 @@ ABSDIR="$(realpath "$DIR")"
 
 set -e
 
+# shellcheck source=config
 . "$DIR"/config
 
 IMAGE_NAME=overview/overview-integration-tester:$OVERVIEW_INTEGRATION_TESTER_VERSION
-docker image ls -q $IMAGE_NAME >/dev/null || docker pull $IMAGE_NAME
+docker image ls -q "$IMAGE_NAME" >/dev/null || docker pull "$IMAGE_NAME"
 
 # [adamhooper, 2018-01-23] HEADLESS=true seems to break within_frame()
 # sporadically with Chrome 63 and Chromedriver 2.35. The closest report I can
@@ -30,6 +31,6 @@ exec docker run --rm -it \
   -v "$ABSDIR"/helpers:/app/helpers \
   -v "$ABSDIR"/reports:/app/reports \
   -v "$ABSDIR"/spec:/app/spec \
-  --shm-size=2g \
+  --init \
   "$IMAGE_NAME" \
   "$@"

skeleton/run-browser

@@ -5,6 +5,7 @@ ABSDIR="$(realpath "$DIR")"
 
 set -e
 
+# shellcheck source=config
 . "$DIR"/config
 
 IMAGE_NAME=overview/overview-integration-tester:$OVERVIEW_INTEGRATION_TESTER_VERSION

test/test.sh

@@ -7,4 +7,5 @@ cp -av "$DIR"/../skeleton "$DIR"/framework
 cp -av "$DIR"/files-atop-framework/* "$DIR"/framework/
 sed -ie 's/^WAIT_FOR_URLS=.*/WAIT_FOR_URLS="http:\/\/overview-web"/' "$DIR"/framework/config
 "$DIR"/framework/run-in-docker-compose
+#"$DIR"/framework/run spec/login_spec.rb
 #"$DIR"/framework/run-browser ./all-tests