Rename valueOf to fromJSON

This commit is contained in:
Shin'ya UEOKA 2019-10-07 12:02:02 +00:00
parent 16352502cf
commit 532eeb5a1d
9 changed files with 30 additions and 30 deletions

View file

@ -9,7 +9,7 @@ import { expect } from 'chai';
describe("settings/form/KeymapsForm", () => {
describe('render', () => {
it('renders keymap fields', () => {
let root = ReactTestRenderer.create(<KeymapsForm value={FormKeymaps.valueOf({
let root = ReactTestRenderer.create(<KeymapsForm value={FormKeymaps.fromJSON({
'scroll.vertically?{"count":1}': 'j',
'scroll.vertically?{"count":-1}': 'k',
})} />).root
@ -48,7 +48,7 @@ describe("settings/form/KeymapsForm", () => {
it('invokes onChange event on edit', (done) => {
ReactTestUtils.act(() => {
ReactDOM.render(<KeymapsForm
value={FormKeymaps.valueOf({
value={FormKeymaps.fromJSON({
'scroll.vertically?{"count":1}': 'j',
'scroll.vertically?{"count":-1}': 'k',
})}

View file

@ -8,7 +8,7 @@ import { FormSearch } from 'shared/SettingData';
describe("settings/form/SearchForm", () => {
describe('render', () => {
it('renders SearchForm', () => {
let root = ReactTestRenderer.create(<SearchForm value={FormSearch.valueOf({
let root = ReactTestRenderer.create(<SearchForm value={FormSearch.fromJSON({
default: 'google',
engines: [['google', 'google.com'], ['yahoo', 'yahoo.com']],
})} />).root;
@ -41,7 +41,7 @@ describe("settings/form/SearchForm", () => {
it('invokes onChange event on edit', (done) => {
ReactTestUtils.act(() => {
ReactDOM.render(<SearchForm
value={FormSearch.valueOf({
value={FormSearch.fromJSON({
default: 'google',
engines: [['google', 'google.com'], ['yahoo', 'yahoo.com']]
})}
@ -67,7 +67,7 @@ describe("settings/form/SearchForm", () => {
it('invokes onChange event on delete', (done) => {
ReactTestUtils.act(() => {
ReactDOM.render(<SearchForm value={FormSearch.valueOf({
ReactDOM.render(<SearchForm value={FormSearch.fromJSON({
default: 'yahoo',
engines: [['louvre', 'google.com'], ['yahoo', 'yahoo.com']]
})}
@ -88,7 +88,7 @@ describe("settings/form/SearchForm", () => {
it('invokes onChange event on add', (done) => {
ReactTestUtils.act(() => {
ReactDOM.render(<SearchForm value={FormSearch.valueOf({
ReactDOM.render(<SearchForm value={FormSearch.fromJSON({
default: 'yahoo',
engines: [['google', 'google.com']]
})}

View file

@ -14,7 +14,7 @@ describe('shared/SettingData', () => {
'scroll.home': '0',
};
let keymaps = FormKeymaps.valueOf(data).toKeymaps().toJSON();
let keymaps = FormKeymaps.fromJSON(data).toKeymaps().toJSON();
expect(keymaps).to.deep.equal({
'j': { type: 'scroll.vertically', count: 1 },
'0': { type: 'scroll.home' },
@ -118,7 +118,7 @@ describe('shared/SettingData', () => {
blacklist: []
};
let settings = FormSettings.valueOf(data).toSettings();
let settings = FormSettings.fromJSON(data).toSettings();
expect({
keymaps: settings.keymaps.toJSON(),
search: settings.search.toJSON(),
@ -211,7 +211,7 @@ describe('shared/SettingData', () => {
}`,
};
let j = SettingData.valueOf(data).toJSON();
let j = SettingData.fromJSON(data).toJSON();
expect(j.source).to.equal('json');
expect(j.json).to.be.a('string');
});
@ -236,7 +236,7 @@ describe('shared/SettingData', () => {
},
};
let j = SettingData.valueOf(data).toJSON();
let j = SettingData.fromJSON(data).toJSON();
expect(j.source).to.equal('form');
expect(j.form).to.deep.equal({
keymaps: {},
@ -277,7 +277,7 @@ describe('shared/SettingData', () => {
}`,
};
let settings = SettingData.valueOf(data).toSettings();
let settings = SettingData.fromJSON(data).toSettings();
expect(settings.search.defaultEngine).to.equal('google');
});
@ -301,7 +301,7 @@ describe('shared/SettingData', () => {
},
};
let settings = SettingData.valueOf(data).toSettings();
let settings = SettingData.fromJSON(data).toSettings();
expect(settings.search.defaultEngine).to.equal('yahoo');
});
});