-
Notifications
You must be signed in to change notification settings - Fork 351
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for setting browser :config with JSON
Two changes in this commit:
- Add ability to accept setting browser configs with a JSON string, like: `:config {"maxFrames":50, "theme": "outline"}`
- No longer accept non quoted keys when setting single value configs. This is not supported anymore: `:config x: 1`. Instead use: `:config "x": 1`.
Helpful hints are displayed below the editor to enlighten users of this change.- Loading branch information
Showing
3 changed files
with
220 additions
and
12 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| /* | ||
| * Copyright (c) 2002-2017 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| /* global jest, describe, test, expect, afterEach */ | ||
|
|
||
| import nock from 'nock' | ||
| import * as config from './config' | ||
| import { update, replace } from 'shared/modules/settings/settingsDuck' | ||
|
|
||
| function FetchError (message) { | ||
| this.name = 'FetchError' | ||
| this.message = message | ||
| } | ||
| FetchError.prototype = Object.create(Error.prototype) | ||
| FetchError.prototype.constructor = FetchError | ||
|
|
||
| describe('commandsDuck config helper', () => { | ||
| const store = { | ||
| getState: () => { | ||
| return { | ||
| meta: { | ||
| settings: { | ||
| 'browser.remote_content_hostname_whitelist': 'okurl.com' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| afterEach(() => { | ||
| nock.cleanAll() | ||
| }) | ||
| test('handles :config "x": 2 and calls the update action creator', () => { | ||
| // Given | ||
| const action = { cmd: ':config "x": 2' } | ||
| const cmdchar = ':' | ||
| const put = jest.fn() | ||
|
|
||
| // When | ||
| const p = config.handleUpdateConfigCommand(action, cmdchar, put, store) | ||
|
|
||
| // Then | ||
| return p.then((res) => { | ||
| expect(res).toEqual({x: 2}) | ||
| expect(put).toHaveBeenCalledWith(update({x: 2})) | ||
| }) | ||
| }) | ||
| test('handles :config "x y": 2 and calls the update action creator', () => { | ||
| // Given | ||
| const action = { cmd: ':config "x y": 2' } | ||
| const cmdchar = ':' | ||
| const put = jest.fn() | ||
|
|
||
| // When | ||
| const p = config.handleUpdateConfigCommand(action, cmdchar, put, store) | ||
|
|
||
| // Then | ||
| return p.then((res) => { | ||
| expect(res).toEqual({'x y': 2}) | ||
| expect(put).toHaveBeenCalledWith(update({'x y': 2})) | ||
| }) | ||
| }) | ||
| test('hints that :config x: 2 is the wrong format', () => { | ||
| // Given | ||
| const action = { cmd: ':config x: 2' } | ||
| const cmdchar = ':' | ||
| const put = jest.fn() | ||
|
|
||
| // When | ||
| const p = config.handleUpdateConfigCommand(action, cmdchar, put, store) | ||
|
|
||
| // Then | ||
| return expect(p) | ||
| .rejects.toEqual(new Error('Could not parse input. Usage: `:config "x": 2`. ' + 'SyntaxError: Unexpected token x in JSON at position 1')) | ||
| .then(() => expect(put).not.toHaveBeenCalled()) | ||
| }) | ||
| test('handles :config {"hej": "ho", "let\'s": "go"} and calls the replace action creator', () => { | ||
| // Given | ||
| const action = { cmd: ':config {"hej": "ho", "let\'s": "go"}' } | ||
| const cmdchar = ':' | ||
| const put = jest.fn() | ||
|
|
||
| // When | ||
| const p = config.handleUpdateConfigCommand(action, cmdchar, put, store) | ||
|
|
||
| // Then | ||
| return p.then((res) => { | ||
| expect(res).toEqual({hej: 'ho', "let's": 'go'}) | ||
| expect(put).toHaveBeenCalledWith(replace({hej: 'ho', "let's": 'go'})) | ||
| }) | ||
| }) | ||
| test('hints that :config {x: 1, y: 2} is the wrong format', () => { | ||
| // Given | ||
| const action = { cmd: ':config {x: 1, y: 2}' } | ||
| const cmdchar = ':' | ||
| const put = jest.fn() | ||
|
|
||
| // When | ||
| const p = config.handleUpdateConfigCommand(action, cmdchar, put, store) | ||
|
|
||
| // Then | ||
| return expect(p) | ||
| .rejects.toEqual(new Error('Could not parse input. Usage: `:config {"x":1,"y":"string"}`. ' + 'SyntaxError: Unexpected token x in JSON at position 1')) | ||
| .then(() => expect(put).not.toHaveBeenCalled()) | ||
| }) | ||
| test('rejects hostnames not in whitelist', () => { | ||
| // Given | ||
| const action = { cmd: ':config https://bad.com/cnf.json' } | ||
| const cmdchar = ':' | ||
| const put = jest.fn() | ||
|
|
||
| // When | ||
| const p = config.handleUpdateConfigCommand(action, cmdchar, put, store) | ||
|
|
||
| // Then | ||
| return expect(p) | ||
| .rejects.toEqual(new Error('Hostname is not allowed according to server whitelist')) | ||
| .then(() => expect(put).not.toHaveBeenCalled()) | ||
| }) | ||
| test('handles :config https://okurl.com/cnf.json and calls the replace action creator', () => { | ||
| // Given | ||
| const json = JSON.stringify({x: 1, y: 'hello'}) | ||
| nock('https://okurl.com').get('/cnf.json').reply(200, json) | ||
| const action = { cmd: ':config https://okurl.com/cnf.json' } | ||
| const cmdchar = ':' | ||
| const put = jest.fn() | ||
|
|
||
| // When | ||
| const p = config.handleUpdateConfigCommand(action, cmdchar, put, store) | ||
|
|
||
| // Then | ||
| return p.then((res) => { | ||
| expect(res).toEqual(JSON.parse(json)) | ||
| expect(put).toHaveBeenCalledWith(replace(JSON.parse(json))) | ||
| }) | ||
| }) | ||
| test('indicates error parsing remote content', () => { | ||
| // Given | ||
| const json = 'no json' | ||
| nock('https://okurl.com').get('/cnf.json').reply(200, json) | ||
| const action = { cmd: ':config https://okurl.com/cnf.json' } | ||
| const cmdchar = ':' | ||
| const put = jest.fn() | ||
|
|
||
| // When | ||
| const p = config.handleUpdateConfigCommand(action, cmdchar, put, store) | ||
|
|
||
| // Then | ||
| return expect(p) | ||
| .rejects.toEqual(new Error(new FetchError('invalid json response body at https://okurl.com/cnf.json reason: Unexpected token o in JSON at position 1'))) | ||
| .then(() => expect(put).not.toHaveBeenCalled()) | ||
| }) | ||
| }) |