don't change AppConfig.environment.url in jsxc_helper_spec
closes #6748
This commit is contained in:
parent
67fbd02ae0
commit
6ea8cd546e
2 changed files with 4 additions and 4 deletions
|
|
@ -7,6 +7,7 @@
|
|||
* Fix empty name field when editing aspect names [#6706](https://github.com/diaspora/diaspora/pull/6706)
|
||||
* Fix internal server error when trying to log out of an expired session [#6707](https://github.com/diaspora/diaspora/pull/6707)
|
||||
* Only mark unread notifications as read [#6711](https://github.com/diaspora/diaspora/pull/6711)
|
||||
* Use https for OEmbeds [#6748](https://github.com/diaspora/diaspora/pull/6748)
|
||||
|
||||
## Features
|
||||
* Added the footer to conversation pages [#6710](https://github.com/diaspora/diaspora/pull/6710)
|
||||
|
|
|
|||
|
|
@ -2,20 +2,19 @@ require 'spec_helper'
|
|||
|
||||
describe JsxcHelper, :type => :helper do
|
||||
before do
|
||||
AppConfig.chat.server.bosh.proxy = false
|
||||
AppConfig.chat.server.bosh.port = 1234
|
||||
AppConfig.chat.server.bosh.bind = '/bind'
|
||||
AppConfig.environment.url = "https://localhost/"
|
||||
AppConfig.instance_variable_set(:@pod_uri, nil)
|
||||
AppConfig.chat.server.bosh.bind = "/bind"
|
||||
end
|
||||
|
||||
describe "#get_bosh_endpoint" do
|
||||
it "using http scheme and default values" do
|
||||
AppConfig.chat.server.bosh.proxy = false
|
||||
expect(helper.get_bosh_endpoint).to include %Q(http://localhost:1234/bind)
|
||||
end
|
||||
|
||||
it "using https scheme and no port" do
|
||||
AppConfig.chat.server.bosh.proxy = true
|
||||
allow(AppConfig).to receive(:pod_uri).and_return(Addressable::URI.parse("https://localhost/"))
|
||||
expect(helper.get_bosh_endpoint).to include %Q(https://localhost/bind)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue