nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't change AppConfig.environment.url in jsxc_helper_spec

Browse source 
closes #6748
This commit is contained in:
Benjamin Neff 2016-03-10 00:34:41 +01:00 committed by Dennis Schubert
parent 67fbd02ae0
commit 6ea8cd546e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -7,6 +7,7 @@
* Fix empty name field when editing aspect names [#6706](https://github.com/diaspora/diaspora/pull/6706) * 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) * 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) * 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 ## Features
* Added the footer to conversation pages [#6710](https://github.com/diaspora/diaspora/pull/6710) * Added the footer to conversation pages [#6710](https://github.com/diaspora/diaspora/pull/6710)

7
spec/helpers/jsxc_helper_spec.rb
View file

@ -2,20 +2,19 @@ require 'spec_helper'
describe JsxcHelper, :type => :helper do describe JsxcHelper, :type => :helper do
before do before do
AppConfig.chat.server.bosh.proxy = false
AppConfig.chat.server.bosh.port = 1234 AppConfig.chat.server.bosh.port = 1234
AppConfig.chat.server.bosh.bind = '/bind' AppConfig.chat.server.bosh.bind = "/bind"
AppConfig.environment.url = "https://localhost/"
AppConfig.instance_variable_set(:@pod_uri, nil)
end end
describe "#get_bosh_endpoint" do describe "#get_bosh_endpoint" do
it "using http scheme and default values" 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) expect(helper.get_bosh_endpoint).to include %Q(http://localhost:1234/bind)
end end
it "using https scheme and no port" do it "using https scheme and no port" do
AppConfig.chat.server.bosh.proxy = true 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) expect(helper.get_bosh_endpoint).to include %Q(https://localhost/bind)
end end
end end