diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-10-16 13:24:27 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-10-16 13:24:27 +0200 |
| commit | b39d0249a72c38ee544b6950e92e01c1a60b19e9 (patch) | |
| tree | 2829162c3331502bcbe26d415c8df87c15c3de20 | |
| parent | 21ef1e1be95518530ef69572fa14f9b09e33475b (diff) | |
| parent | 68287294867444ca96abad7deafe0c9050f2e127 (diff) | |
| download | mullvadvpn-b39d0249a72c38ee544b6950e92e01c1a60b19e9.tar.xz mullvadvpn-b39d0249a72c38ee544b6950e92e01c1a60b19e9.zip | |
Merge branch 'dont-show-hardcoded-ips'
| -rw-r--r-- | app/components/Connect.js | 4 | ||||
| -rw-r--r-- | test/components/Connect.spec.js | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/components/Connect.js b/app/components/Connect.js index 5f5af30955..c49912349d 100644 --- a/app/components/Connect.js +++ b/app/components/Connect.js @@ -113,8 +113,8 @@ export default class Connect extends Component { ? serverInfo : { city: '\u2003', country: '\u2002' }; const ip = isConnected - ? '185.65.132.102' - : '78.65.17.155'; //this.props.connection.clientIp; + ? serverInfo.address + : '\u2003'; //this.props.connection.clientIp; // We decided to not include the map in the first beta release to customers // but it MUST be included in the following releases. Therefore we choose diff --git a/test/components/Connect.spec.js b/test/components/Connect.spec.js index 62da014cd7..07c67a57bc 100644 --- a/test/components/Connect.spec.js +++ b/test/components/Connect.spec.js @@ -38,7 +38,7 @@ describe('components/Connect', () => { it('shows the connection location when connecting', () => { const component = renderConnecting({ getServerInfo: (_s) => ({ - address: '', + address: '185.65.132.102', name: '', location: [0, 0], country: 'norway', @@ -58,7 +58,7 @@ describe('components/Connect', () => { it('shows the connection location when connected', () => { const component = renderConnected({ getServerInfo: (_s) => ({ - address: '', + address: '185.65.132.102', name: '', location: [0, 0], country: 'sweden', @@ -78,21 +78,21 @@ describe('components/Connect', () => { it('shows the connection location when disconnected', () => { const component = renderNotConnected({ getServerInfo: (_s) => ({ - address: '', + address: '\u2003', name: '', location: [0, 0], country: 'sweden', city: 'gothenburg', }), }, { - clientIp: '78.65.17.155', + clientIp: '\u2003', }); const countryAndCity = component.find('.connect__status-location'); const ipAddr = component.find('.connect__status-ipaddress'); expect(countryAndCity.text()).to.contain('\u2002'); expect(countryAndCity.text()).to.not.contain('\u2003'); - expect(ipAddr.text()).to.contain('78.65.17.155'); + expect(ipAddr.text()).to.contain('\u2003'); }); it('shows the country name in the location switcher', () => { |