Skip to content

Only extend un-serializable fields when updating fixture contents with user input #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2015
Merged

Only extend un-serializable fields when updating fixture contents with user input #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/components/component-playground.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,15 @@ module.exports = React.createClass({
newState = {fixtureUserInput: userInput};

try {
var originalFixtureContents =
this.constructor.getSelectedFixtureContents(this.props);

// We only want to extend Function props because they can't be serialized
// and they are not part of the editor's contents
var fixtureContents =
_.cloneDeep(this.constructor.getSelectedFixtureContents(this.props));
_.pick(originalFixtureContents, function(value, key) {
return _.isFunction(value);
});

if (userInput) {
_.merge(fixtureContents, JSON.parse(userInput));
Expand Down
18 changes: 16 additions & 2 deletions tests/components/component-playground/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,9 @@ describe('ComponentPlayground component', function() {
fixtures: {
'simple state': {
defaultProp: true,
unserializableProp: function() {
// noop
},
nested: {
nestedProp: true
}
Expand All @@ -309,11 +312,22 @@ describe('ComponentPlayground component', function() {
render();
});

it('should extend fixture contents with user input', function() {
it('should extend unserializable fixture contents with user input',
function() {
triggerEditorChange('{"customProp": true}');

expect(component.state.fixtureContents.customProp).to.equal(true);
expect(component.state.fixtureContents.defaultProp).to.equal(true);
expect(component.state.fixtureContents.unserializableProp).to.equal(
params.components.MyComponent.fixtures['simple state']
.unserializableProp);
});

it('should not extend serializable fixture contents with user input',
function() {
triggerEditorChange('{"customProp": true}');

expect(component.state.fixtureContents.customProp).to.equal(true);
expect(component.state.fixtureContents.defaultProp).to.equal(undefined);
});

it('should not alter the original fixture contents', function() {
Expand Down