Requested additions for :server_mount option #138
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -25,7 +25,7 @@ class Jasmine < Guard | |||
| server: :auto, | |||
| server_env: ENV['RAILS_ENV'] || 'development', | |||
| server_timeout: 60, | |||
| server_mount: '/jasmine', | |||
| server_mount: '/jasmine', # set here for documnetation puprposes; actually determiend at runtime by presence (or lack thereof) of the JasmineRails constant | |||
| @@ -148,6 +153,7 @@ def spec(*paths) | |||
| runner_options[:spec_dir] = options.spec_dir || (File.exists?(File.join('spec', 'javascripts')) ? File.join('spec', 'javascripts') : 'spec') | |||
| runner_options[:server] = options.server.to_sym == :auto ? ::Guard::Jasmine::Server.detect_server(runner_options[:spec_dir]) : options.server.to_sym | |||
| runner_options[:jasmine_url] = options.url || "http://localhost:#{ runner_options[:port] }#{ options.server.to_sym == :jasmine_gem ? '/' : '/jasmine' }" | |||
There was a problem hiding this comment.
Won't this line also need to interpolate options.mount instead of hard-coding /jasmine?
There was a problem hiding this comment.
That's a good point... I had intentionally not added that in, figuring that to leave the default mount point to be /jasmine in the interest of minimum disruption, but it would be more internally consistent. Anyone with add'l thoughts on the matter?
|
Hi, I'm on holiday and won't be able to have a look at this before the first week of August. |
|
Merged with some minor changes in the specs to set the JasmineRails module with |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
--mountor-m):server_mountand:jasmine_urloption is not provided, will auto-build URL using/specsif JasmineRails is found and/jasmineif it is not