Merge pull request #285 from happo/more-logging

More logging
happo · Jun 25, 2024 · f19781e · f19781e
2 parents 5fd8016 + 68f8f45
commit f19781e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/bin/happo-ci b/bin/happo-ci
@@ -38,6 +38,19 @@ echo "HAPPO_GIT_COMMAND: ${HAPPO_GIT_COMMAND}"
 echo "HAPPO_COMMAND: ${HAPPO_COMMAND}"
 echo "HAPPO_FALLBACK_SHAS_COUNT: ${HAPPO_FALLBACK_SHAS_COUNT}"
 
+echo "Using Node version: $(node -v)"
+
+set +e
+HAPPO_VERSION=$("$HAPPO_COMMAND" version)
+if [ $? -eq 0 ]; then
+  echo "Using happo CLI version: ${HAPPO_VERSION}"
+else
+  echo "Failed to execute ${HAPPO_COMMAND}. Are you running from a subdirectory in the repository perhaps? To resolve this, you could either run from the repository root or set the environment variable HAPPO_COMMAND to override where Happo looks for the the cli.js script." >&2
+  exit 1
+fi
+set -e
+
+
 NPM_CLIENT="npm"
 NPM_CLIENT_FLAGS="--no-save"
 CHECK_FOR_HAPPO="npm ls happo.io"

diff --git a/test/cli-mock.js b/test/cli-mock.js
@@ -25,3 +25,8 @@ if (/compare no-report bar/.test(cmd)) {
 if (/compare fail bar/.test(cmd)) {
   process.exit(1);
 }
+
+if (/version/.test(cmd)) {
+  console.log('v0.0.999');
+  process.exit(0);
+}
diff --git a/test/happo-ci-test.js b/test/happo-ci-test.js
@@ -66,6 +66,16 @@ describe('when CURRENT_SHA is missing', () => {
   });
 });
 
+describe('when HAPPO_COMMAND is pointing to a non-existant file', () => {
+  beforeEach(() => {
+    env.HAPPO_COMMAND = './foo/bar.js';
+  });
+
+  it('fails with a message', () => {
+    expect(subject).toThrow(/Failed to execute \.\/foo\/bar\.js/);
+  });
+});
+
 describe('when CHANGE_URL is missing', () => {
   beforeEach(() => {
     delete env.CHANGE_URL;
@@ -84,6 +94,7 @@ describe('when CURRENT_SHA and PREVIOUS_SHA is the same', () => {
   it('runs a single report', () => {
     subject();
     expect(getCliLog()).toEqual([
+      'version',
       'run bar --link http://foo.bar/ --message Commit message',
     ]);
     expect(getGitLog()).toEqual([
@@ -99,6 +110,7 @@ describe('when there is a report for PREVIOUS_SHA', () => {
   it('runs the right happo commands', () => {
     subject();
     expect(getCliLog()).toEqual([
+      'version',
       'start-job foo bar --link http://foo.bar/ --message Commit message',
       'run bar --link http://foo.bar/ --message Commit message',
       'compare foo bar --link http://foo.bar/ --message Commit message --author Tom Dooner <tom@dooner.com>',
@@ -121,6 +133,7 @@ describe('when there is a report for PREVIOUS_SHA', () => {
     it('runs the right happo commands', () => {
       subject();
       expect(getCliLog()).toEqual([
+        'version',
         'start-job foo bar --link http://foo.bar/ --message Commit message',
         'run bar --link http://foo.bar/ --message Commit message',
         'has-report foo',
@@ -146,6 +159,7 @@ describe('when there is a report for PREVIOUS_SHA', () => {
     it('runs the right happo commands', () => {
       subject();
       expect(getCliLog()).toEqual([
+        'version',
         'run bar --link http://foo.bar/ --message Commit message',
         'compare foo bar --link http://foo.bar/ --message Commit message --author Tom Dooner <tom@dooner.com>',
       ]);
@@ -220,6 +234,7 @@ describe('when there is no report for PREVIOUS_SHA', () => {
   it('does not checkout anything, runs a single report', () => {
     subject();
     expect(getCliLog()).toEqual([
+      'version',
       'start-job no-report bar --link http://foo.bar/ --message Commit message',
       'run bar --link http://foo.bar/ --message Commit message',
       'compare no-report bar --link http://foo.bar/ --message Commit message --author Tom Dooner <tom@dooner.com>',
@@ -241,6 +256,7 @@ describe('when there is no report for PREVIOUS_SHA', () => {
     it('runs the right happo commands', () => {
       subject();
       expect(getCliLog()).toEqual([
+        'version',
         'start-job no-report bar --link http://foo.bar/ --message Commit message',
         'run bar --link http://foo.bar/ --message Commit message',
         'has-report no-report',
@@ -272,6 +288,7 @@ describe('when the compare call fails', () => {
   it('fails the script', () => {
     expect(subject).toThrow();
     expect(getCliLog()).toEqual([
+      'version',
       'start-job fail bar --link http://foo.bar/ --message Commit message',
       'run bar --link http://foo.bar/ --message Commit message',
       'compare fail bar --link http://foo.bar/ --message Commit message --author Tom Dooner <tom@dooner.com>',
@@ -296,6 +313,7 @@ describe('when happo.io is not installed for the PREVIOUS_SHA and HAPPO_IS_ASYNC
   it('runs the right happo commands', () => {
     subject();
     expect(getCliLog()).toEqual([
+      'version',
       'start-job no-happo bar --link http://foo.bar/ --message Commit message',
       'run bar --link http://foo.bar/ --message Commit message',
       'has-report no-happo',