wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-08 07:31:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixer pre/post

Browse Source
This commit is contained in:
Wyatt Johnson
2017-01-24 13:10:35 -07:00
parent eeaefd9656
commit cda768d694
17 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/cli-settings
+1 -1
View File
@@ -22,7 +22,7 @@ program
.command('init')
.description('initilizes the talk settings')
.action(() => {
const defaults = {id: '1', moderation: 'pre'};
const defaults = {id: '1', moderation: 'PRE'};
SettingsService
.init(defaults)
client/coral-admin/src/containers/Configure/CommentSettings.js
+4 -4
View File
@@ -28,7 +28,7 @@ const updateCharCount = (updateSettings, settingsError) => (event) => {
};
const updateModeration = (updateSettings, mod) => () => {
const moderation = mod === 'pre' ? 'post' : 'pre';
const moderation = mod === 'PRE' ? 'POST' : 'PRE';
updateSettings({moderation});
};
@@ -70,15 +70,15 @@ const CommentSettings = ({fetchingSettings, title, updateSettings, settingsError
return (
<div className={styles.commentSettingsSection}>
<h3>{title}</h3>
<Card className={`${styles.configSetting} ${settings.moderation === 'pre' ? styles.enabledSetting : styles.disabledSetting}`}>
<Card className={`${styles.configSetting} ${settings.moderation === 'PRE' ? styles.enabledSetting : styles.disabledSetting}`}>
<div className={styles.action}>
<Checkbox
onChange={updateModeration(updateSettings, settings.moderation)}
checked={settings.moderation === 'pre'} />
checked={settings.moderation === 'PRE'} />
</div>
<div className={styles.content}>
<div className={styles.settingsHeader}>{lang.t('configure.enable-pre-moderation')}</div>
<p className={settings.moderation === 'pre' ? '' : styles.disabledSettingText}>
<p className={settings.moderation === 'PRE' ? '' : styles.disabledSettingText}>
{lang.t('configure.enable-pre-moderation-text')}
</p>
</div>
client/coral-configure/containers/ConfigureStreamContainer.js
+2 -2
View File
@@ -14,7 +14,7 @@ class ConfigureStreamContainer extends Component {
super(props);
this.state = {
premod: props.config.moderation === 'pre',
premod: props.config.moderation === 'PRE',
premodLinks: false
};
@@ -26,7 +26,7 @@ class ConfigureStreamContainer extends Component {
handleApply () {
const {premod, changed} = this.state;
const newConfig = {
moderation: premod ? 'pre' : 'post'
moderation: premod ? 'PRE' : 'POST'
};
if (changed) {
this.props.updateConfiguration(newConfig);
client/coral-framework/helpers/response.js
+1 -1
View File
@@ -18,7 +18,7 @@ const buildOptions = (inputOptions = {}) => {
if (options._csrf) {
switch (options.method.toLowerCase()) {
case 'post':
case 'POST':
case 'put':
case 'delete':
options.headers['x-csrf-token'] = options._csrf;
client/coral-plugin-commentbox/CommentBox.js
+1 -1
View File
@@ -120,7 +120,7 @@ class CommentBox extends Component {
cStyle={!length || (charCount && length > charCount) ? 'lightGrey' : 'darkGrey'}
className={`${name}-button`}
onClick={this.postComment}>
{lang.t('post')}
{lang.t('POST')}
</Button>
)
}
init.js
+1 -1
View File
@@ -5,7 +5,7 @@ module.exports = () => Promise.all([
// Upsert the settings object.
SettingsService.init({
id: '1',
moderation: 'pre',
moderation: 'PRE',
wordlist: {
banned: [],
suspect: []
models/setting.js
+3 -3
View File
@@ -20,10 +20,10 @@ const SettingSchema = new Schema({
moderation: {
type: String,
enum: [
'pre',
'post'
'PRE',
'POST'
],
default: 'pre'
default: 'PRE'
},
infoBoxEnable: {
type: Boolean,
test/e2e/tests/EmbedStreamTests.js
+4 -4
View File
@@ -20,7 +20,7 @@ module.exports = {
},
'User registers and posts a comment with premod off': client => {
client.perform((client, done) => {
mocks.settings({moderation: 'post'})
mocks.settings({moderation: 'POST'})
.then(() => {
// Load Page
@@ -61,7 +61,7 @@ module.exports = {
},
'User posts a comment with premod on': client => {
client.perform((client, done) => {
mocks.settings({moderation: 'pre'})
mocks.settings({moderation: 'PRE'})
.then(() => {
// Load Page
@@ -86,7 +86,7 @@ module.exports = {
},
'User replies to a comment with premod off': client => {
client.perform((client, done) => {
mocks.settings({moderation: 'post'})
mocks.settings({moderation: 'POST'})
.then(() => {
// Load Page
@@ -119,7 +119,7 @@ module.exports = {
},
'User replies to a comment with premod on': client => {
client.perform((client, done) => {
mocks.settings({moderation: 'pre'})
mocks.settings({moderation: 'PRE'})
// Add a mock user
.then(() => {
test/routes/api/comments/index.js
+1 -1
View File
@@ -15,7 +15,7 @@ const CommentsService = require('../../../../services/comments');
const UsersService = require('../../../../services/users');
const SettingsService = require('../../../../services/settings');
const settings = {id: '1', moderation: 'pre', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
describe('/api/v1/comments', () => {
test/routes/api/queue/index.js
+1 -1
View File
@@ -13,7 +13,7 @@ const Action = require('../../../../models/action');
const UsersService = require('../../../../services/users');
const SettingsService = require('../../../../services/settings');
const settings = {id: '1', moderation: 'pre', wordlist: {banned: ['banned'], suspect: ['suspect']}};
const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['banned'], suspect: ['suspect']}};
describe('/api/v1/queue', () => {
const comments = [{
test/routes/api/settings/index.js
+4 -4
View File
@@ -8,7 +8,7 @@ chai.should();
chai.use(require('chai-http'));
const SettingsService = require('../../../../services/settings');
const defaults = {id: '1', moderation: 'pre'};
const defaults = {id: '1', moderation: 'PRE'};
describe('/api/v1/settings', () => {
@@ -25,7 +25,7 @@ describe('/api/v1/settings', () => {
.then((res) => {
expect(res).to.have.status(200);
expect(res).to.be.json;
expect(res.body).to.have.property('moderation', 'pre');
expect(res.body).to.have.property('moderation', 'PRE');
});
});
});
@@ -36,14 +36,14 @@ describe('/api/v1/settings', () => {
return chai.request(app)
.put('/api/v1/settings')
.set(passport.inject({roles: ['ADMIN']}))
.send({moderation: 'post'})
.send({moderation: 'POST'})
.then((res) => {
expect(res).to.have.status(204);
return SettingsService.retrieve();
})
.then((settings) => {
expect(settings).to.have.property('moderation', 'post');
expect(settings).to.have.property('moderation', 'POST');
});
});
});
test/routes/api/user/index.js
+1 -1
View File
@@ -6,7 +6,7 @@ const chai = require('chai');
const expect = chai.expect;
const SettingsService = require('../../../../services/settings');
const settings = {id: '1', moderation: 'pre', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
// Setup chai.
chai.should();
test/services/assets.js
+2 -2
View File
@@ -72,7 +72,7 @@ describe('services.AssetsService', () => {
expect(asset).to.have.property('settings');
expect(asset.settings).to.be.null;
return AssetsService.overrideSettings(asset.id, {moderation: 'pre'});
return AssetsService.overrideSettings(asset.id, {moderation: 'PRE'});
})
.then(() => {
return AssetsService.findOrCreateByUrl('https://override.test.com/asset');
@@ -80,7 +80,7 @@ describe('services.AssetsService', () => {
.then((asset) => {
expect(asset).to.have.property('settings');
expect(asset.settings).is.an('object');
expect(asset.settings).to.have.property('moderation', 'pre');
expect(asset.settings).to.have.property('moderation', 'PRE');
});
});
});
test/services/comments.js
+1 -1
View File
@@ -6,7 +6,7 @@ const UsersService = require('../../services/users');
const SettingsService = require('../../services/settings');
const CommentsService = require('../../services/comments');
const settings = {id: '1', moderation: 'pre', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
const expect = require('chai').expect;
test/services/settings.js
+6 -6
View File
@@ -3,12 +3,12 @@ const expect = require('chai').expect;
describe('services.SettingsService', () => {
beforeEach(() => SettingsService.init({moderation: 'pre', wordlist: ['donut']}));
beforeEach(() => SettingsService.init({moderation: 'PRE', wordlist: ['donut']}));
describe('#retrieve()', () => {
it('should have a moderation field defined', () => {
return SettingsService.retrieve().then(settings => {
expect(settings).to.have.property('moderation').and.to.equal('pre');
expect(settings).to.have.property('moderation').and.to.equal('PRE');
});
});
@@ -22,10 +22,10 @@ describe('services.SettingsService', () => {
describe('#update()', () => {
it('should update the settings with a passed object', () => {
const mockSettings = {moderation: 'post', infoBoxEnable: true, infoBoxContent: 'yeah'};
const mockSettings = {moderation: 'POST', infoBoxEnable: true, infoBoxContent: 'yeah'};
return SettingsService.update(mockSettings).then(updatedSettings => {
expect(updatedSettings).to.be.an('object');
expect(updatedSettings).to.have.property('moderation').and.to.equal('post');
expect(updatedSettings).to.have.property('moderation').and.to.equal('POST');
expect(updatedSettings).to.have.property('infoBoxEnable', true);
expect(updatedSettings).to.have.property('infoBoxContent', 'yeah');
});
@@ -45,11 +45,11 @@ describe('services.SettingsService', () => {
return SettingsService
.retrieve()
.then((settings) => {
let ovrSett = {moderation: 'post'};
let ovrSett = {moderation: 'POST'};
settings.merge(ovrSett);
expect(settings).to.have.property('moderation', 'post');
expect(settings).to.have.property('moderation', 'POST');
});
});
});
test/services/users.js
+1 -1
View File
@@ -7,7 +7,7 @@ describe('services.UsersService', () => {
let mockUsers;
beforeEach(() => {
const settings = {id: '1', moderation: 'pre', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
return SettingsService.init(settings).then(() => {
return UsersService.createLocalUsers([{
test/services/wordlist.js
+1 -1
View File
@@ -17,7 +17,7 @@ describe('services.Wordlist', () => {
};
let wordlist = new Wordlist();
const settings = {id: '1', moderation: 'pre', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
beforeEach(() => SettingsService.init(settings));