Support for "Only show overridden" in site text customization

This commit is contained in:
Robin Ward
2015-11-30 15:22:58 -05:00
parent 04593b8fef
commit de88be2fbc
17 changed files with 119 additions and 35 deletions

View File

@@ -6,9 +6,22 @@ test("search for a key", () => {
visit("/admin/customize/site_texts");
fillIn('.site-text-search', 'Test');
andThen(() => ok(exists('.site-text')));
andThen(() => {
ok(exists('.site-text'));
ok(exists(".site-text:not(.overridden)"));
ok(exists('.site-text.overridden'));
});
// Only show overridden
click('.extra-options input');
andThen(() => {
ok(!exists(".site-text:not(.overridden)"));
ok(exists('.site-text.overridden'));
});
});
test("edit and revert a site text by key", () => {
visit("/admin/customize/site_texts/site.test");
andThen(() => {

View File

@@ -210,7 +210,7 @@ export default function() {
});
this.get('/fruits', function() {
return response({ __rest_serializer: "1", fruits, farmers, colors });
return response({ __rest_serializer: "1", fruits, farmers, colors, extras: {hello: 'world'} });
});
this.get('/widgets/:widget_id', function(request) {
@@ -262,7 +262,16 @@ export default function() {
this.post('/topics/timings', () => response(200, {}));
const siteText = {id: 'site.test', value: 'Test McTest'};
this.get('/admin/customize/site_texts', () => response(200, {site_texts: [siteText] }));
const overridden = {id: 'site.overridden', value: 'Overridden', overridden: true };
this.get('/admin/customize/site_texts', request => {
if (request.queryParams.overridden) {
return response(200, {site_texts: [overridden] })
} else {
return response(200, {site_texts: [siteText, overridden] })
}
});
this.get('/admin/customize/site_texts/:key', () => response(200, {site_text: siteText }));
this.delete('/admin/customize/site_texts/:key', () => response(200, {site_text: siteText }));

View File

@@ -116,7 +116,6 @@ test('destroyRecord when new', function(assert) {
});
});
test('find embedded', function(assert) {
const store = createStore();
return store.find('fruit', 2).then(function(f) {
@@ -136,6 +135,7 @@ test('findAll embedded', function(assert) {
return store.findAll('fruit').then(function(fruits) {
assert.equal(fruits.objectAt(0).get('farmer.name'), 'Old MacDonald');
assert.equal(fruits.objectAt(0).get('farmer'), fruits.objectAt(1).get('farmer'), 'points at the same object');
assert.equal(fruits.get('extras.hello'), 'world', 'it can supply extra information');
const fruitCols = fruits.objectAt(0).get('colors');
assert.equal(fruitCols.length, 2);