Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return a conflict when goobi returns a conflict #269

Merged
merged 1 commit into from May 16, 2019
Merged

Return a conflict when goobi returns a conflict #269

merged 1 commit into from May 16, 2019

Conversation

jcoyne
Copy link
Contributor

@jcoyne jcoyne commented May 16, 2019

No description provided.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.002%) to 97.987% when pulling 732ff24 on conflict into 0ba997c on master.

Copy link
Contributor

@justinlittman justinlittman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approve pending consideration of comment.

@@ -87,7 +87,7 @@ RELEASE:
PURL_BASE_URI : 'http://purl.stanford.edu'

GOOBI:
URL: 'http://localhost:9292'
URL: 'http://goobi-env.stanford.edu:9292'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you intend this to change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. Webmock was set to allow connections to localhost. Changing the url is the easiest way for it to say "stub this connection"

@jcoyne jcoyne merged commit 5db1889 into master May 16, 2019
@jcoyne jcoyne deleted the conflict branch May 16, 2019 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants