Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

fixing unit test

Browse Source
This commit is contained in:
Amine Ben hammou
2018-01-19 14:25:29 +00:00
parent 5e152e920e
commit f42b61a49e
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
assets/js/src/newsletters/templates.jsx
View File

@ -112,16 +112,17 @@ const templatesCategories = [
{ {
name: 'saved', name: 'saved',
label: MailPoet.I18n.t('savedTemplates'), label: MailPoet.I18n.t('savedTemplates'),
} },
] ];
const CategoryTab = ({name, label, selected, select}) => const CategoryTab = ({ name, label, selected, select }) => (
<li><a <li><a
href="javascript:" href="javascript:"
className={selected === name ? 'current' : ''} className={selected === name ? 'current' : ''}
onClick={() => select(name)} onClick={() => select(name)}
> {label} > {label}
</a></li> </a></li>
);
const NewsletterTemplates = React.createClass({ const NewsletterTemplates = React.createClass({
getInitialState: function () { getInitialState: function () {
@ -158,13 +159,12 @@ const NewsletterTemplates = React.createClass({
]; ];
} }
let templates = templatesCategories.reduce((result, {name}) => { let templates = templatesCategories.reduce((result, { name }) => {
result[name] = []; const obj = result;
return result; obj[name] = [];
return obj;
}, {}); }, {});
console.log(response.data)
templates = response.data.reduce((result, item) => { templates = response.data.reduce((result, item) => {
JSON.parse(item.categories).forEach((category) => { JSON.parse(item.categories).forEach((category) => {
result[category].push(item); result[category].push(item);
@ -343,8 +343,8 @@ const NewsletterTemplates = React.createClass({
); );
}); });
if (templates.length == 0) { if (templates.length === 0) {
templates = <p>{MailPoet.I18n.t('noTemplates')}</p> templates = <p>{MailPoet.I18n.t('noTemplates')}</p>;
} }
const boxClasses = classNames( const boxClasses = classNames(
@ -361,14 +361,14 @@ const NewsletterTemplates = React.createClass({
<div className="wp-filter hide-if-no-js"> <div className="wp-filter hide-if-no-js">
<ul className="filter-links"> <ul className="filter-links">
{templatesCategories.map(({name, label}) => {templatesCategories.map(({ name, label }) => (
<CategoryTab <CategoryTab
key={name} key={name}
name={name} name={name}
label={label} label={label}
selected={this.state.selectedCategory} selected={this.state.selectedCategory}
select={category => this.setState({ selectedCategory: category })} /> select={category => this.setState({ selectedCategory: category })} />
)} ))}
</ul> </ul>
</div> </div>

10
tests/unit/API/JSON/v1/NewsletterTemplatesTest.php
View File

@ -102,9 +102,13 @@ class NewsletterTemplatesTest extends \MailPoetTest {
$template_data['body'] = json_decode($template_data['body'], true); $template_data['body'] = json_decode($template_data['body'], true);
$normalize = function($array) { $normalize = function($array) {
return array_filter($array, function($key) { $result = array();
return in_array($key, ['newsletter_id', 'name', 'description', 'body']); foreach($array as $key => $value) {
}, ARRAY_FILTER_USE_KEY); if(in_array($key, ['newsletter_id', 'name', 'description', 'body'])) {
$result[$key] = $value;
}
}
return $result;
}; };
expect($normalize($response->data))->equals($template_data); expect($normalize($response->data))->equals($template_data);