TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-11 09:53:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5946 from kevinansfield/fix-gh-validation-status-container

Browse Source 
Fix gh-validation-settings-container throwing error on tag settings page
This commit is contained in:
Hannah Wolfe 2015-10-14 17:45:35 +01:00
commit 9650927076
2 changed files with 77 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/client/app/components/gh-validation-status-container.js
View File

@ -11,8 +11,11 @@ import ValidationStateMixin from 'ghost/mixins/validation-state';
export default Ember.Component.extend(ValidationStateMixin, {
classNameBindings: ['errorClass'],
errorClass: Ember.computed('hasError', 'hasValidated.[]', function () {
if (this.hasValidated.contains(this.get('property'))) {
errorClass: Ember.computed('property', 'hasError', 'hasValidated.[]', function () {
let hasValidated = this.get('hasValidated'),
property = this.get('property');
if (hasValidated && hasValidated.contains(property)) {
return this.get('hasError') ? 'error' : 'success';
} else {
return '';

72
core/client/tests/integration/components/gh-validation-status-container-test.js Normal file
View File

@ -0,0 +1,72 @@
/* jshint expr:true */
import { expect } from 'chai';
import {
describeComponent,
it
} from 'ember-mocha';
import hbs from 'htmlbars-inline-precompile';
import Ember from 'ember';
import DS from 'ember-data';
describeComponent(
'gh-validation-status-container',
'Integration: Component: gh-validation-status-container',
{
integration: true
},
function () {
beforeEach(function () {
let testObject = new Ember.Object();
testObject.set('name', 'Test');
testObject.set('hasValidated', []);
testObject.set('errors', DS.Errors.create());
this.set('testObject', testObject);
});
it('has no success/error class by default', function () {
this.render(hbs`
{{#gh-validation-status-container class="gh-test" property="name" errors=testObject.errors hasValidated=testObject.hasValidated}}
{{/gh-validation-status-container}}
`);
expect(this.$('.gh-test')).to.have.length(1);
expect(this.$('.gh-test').hasClass('success')).to.be.false;
expect(this.$('.gh-test').hasClass('error')).to.be.false;
});
it('has success class when valid', function () {
this.get('testObject.hasValidated').push('name');
this.render(hbs`
{{#gh-validation-status-container class="gh-test" property="name" errors=testObject.errors hasValidated=testObject.hasValidated}}
{{/gh-validation-status-container}}
`);
expect(this.$('.gh-test')).to.have.length(1);
expect(this.$('.gh-test').hasClass('success')).to.be.true;
expect(this.$('.gh-test').hasClass('error')).to.be.false;
});
it('has error class when invalid', function () {
this.get('testObject.hasValidated').push('name');
this.get('testObject.errors').add('name', 'has error');
this.render(hbs`
{{#gh-validation-status-container class="gh-test" property="name" errors=testObject.errors hasValidated=testObject.hasValidated}}
{{/gh-validation-status-container}}
`);
expect(this.$('.gh-test')).to.have.length(1);
expect(this.$('.gh-test').hasClass('success')).to.be.false;
expect(this.$('.gh-test').hasClass('error')).to.be.true;
});
it('still renders if hasValidated is undefined', function () {
this.set('testObject.hasValidated', undefined);
this.render(hbs`
{{#gh-validation-status-container class="gh-test" property="name" errors=testObject.errors hasValidated=testObject.hasValidated}}
{{/gh-validation-status-container}}
`);
expect(this.$('.gh-test')).to.have.length(1);
});
}
);