Skip to content

Commit

Permalink
Add linting for frontend/static-src/tests dir
Browse files Browse the repository at this point in the history
  • Loading branch information
pdehaan committed Apr 11, 2016
1 parent 56c358b commit c1375a2
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function shouldLint(opt, task) {
}

function lintTask() {
return gulp.src(['*.js', SRC_PATH + 'app/**/*.js'])
return gulp.src(['*.js', SRC_PATH + '{app,test}/**/*.js'])
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.failOnError());
Expand Down
4 changes: 2 additions & 2 deletions testpilot/frontend/static-src/test/browser.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
if (typeof(window) === 'object') {
var tapeDom = require('tape-dom');
const tapeDom = require('tape-dom');
tapeDom.installCSS();
tapeDom.stream(require('tape-catch'));
}

require('./collections/*js', {mode: 'expand'});
require('./collections/*.js', {mode: 'expand'});
require('./lib/*.js', {mode: 'expand'});
require('./models/*.js', {mode: 'expand'});
require('./views/*.js', {mode: 'expand'});
7 changes: 4 additions & 3 deletions testpilot/frontend/static-src/test/collections/experiments.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import test from 'tape-catch';
import app from 'ampersand-app';
import Model from '../../app/models/experiment';
import Experiments from '../../app/collections/experiments';

test(`Running Tests for ${__filename}`, a => a.end());

test('addon-uninstalled event unsets enabled for each experiment', t => {
t.plan(1);
const experiments = new Experiments([{title: 'test experiment 1', enabled: true},
{title: 'test experiment 2', enabled: true}]);
const experiments = new Experiments([
{title: 'test experiment 1', enabled: true},
{title: 'test experiment 2', enabled: true}
]);

app.trigger('webChannel:addon-self:uninstalled');

Expand Down
20 changes: 10 additions & 10 deletions testpilot/frontend/static-src/test/general.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
var test = require('tape-catch');
var path = require('path');
var fs = require('fs');
const test = require('tape-catch');
const path = require('path');
const fs = require('fs');

test('Running Tests for '+__filename, function(a) {
test('Running Tests for ' + __filename, (a) => {
a.end();
});

test('Each image in images directory has a retina version', function(t) {
test('Each image in images directory has a retina version', (t) => {
t.plan(1);
t.comment(path.resolve(__dirname, '../images'))
fs.readdir(path.resolve(__dirname, '../images'), function(err, files) {
t.comment(path.resolve(__dirname, '../images'));
fs.readdir(path.resolve(__dirname, '../images'), (err, files) => {
if (err) t.fail('fs.readdir call failed, check your paths');

files = files.filter(function(f) {
const origFiles = files.filter((f) => {
return (!~f.indexOf('favicon.ico')); // exclude favicon
});

const retinaFiles = files.filter(function(f) {
const retinaFiles = files.filter((f) => {
return !!~f.indexOf('@2x');
});

t.same(retinaFiles.length, files.length / 2);
t.same(retinaFiles.length, origFiles.length / 2);
});
});
2 changes: 1 addition & 1 deletion testpilot/frontend/static-src/test/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html>
<head>
<meta charset="utf-8">
<meta charset="utf-8" />
<title>tape-dom tests</title>
</head>
<body>
Expand Down
8 changes: 4 additions & 4 deletions testpilot/frontend/static-src/test/models/experiment.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ test('enabled property is initialized as false by default', t => {

test('install event sets enabled property', t => {
t.plan(1);
const model = new Experiment({id:'[email protected]',
const model = new Experiment({id: '[email protected]',
title: 'test experiment 1'});

app.trigger('addon-install:install-ended', {id:'[email protected]'});
app.trigger('addon-install:install-ended', {id: '[email protected]'});

t.equal(model.enabled, true);
});

test('uninstall event unsets enabled property', t => {
t.plan(1);
const model = new Experiment({id:'[email protected]',
const model = new Experiment({id: '[email protected]',
title: 'test experiment 1',
enabled: true});

app.trigger('addon-uninstall:uninstall-ended', {id:'[email protected]'});
app.trigger('addon-uninstall:uninstall-ended', {id: '[email protected]'});

t.equal(model.enabled, false);
});
8 changes: 4 additions & 4 deletions testpilot/frontend/static-src/test/views/base-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let afterCalled = false;

test(`Running Tests for ${__filename}`, a => a.end());

const myView = view.extend({
const MyView = view.extend({
template: '<div></div>',
beforeRender: () => {
beforeCalled = true;
Expand All @@ -19,22 +19,22 @@ const myView = view.extend({
test('Base view renders', t => {
t.plan(1);

const el = new myView().render().el;
const el = new MyView().render().el;
t.ok(el);
});

test('beforeRender is called', t => {
t.plan(1);

new myView().render();
new MyView().render();

t.ok(beforeCalled);
});

test('afterRender is called', t => {
t.plan(1);

new myView().render()
new MyView().render();

t.ok(afterCalled);
});
2 changes: 1 addition & 1 deletion testpilot/frontend/static-src/test/views/error-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const test = around(tape)

test('Error page view renders', t => {
t.plan(1);
const view = new View({headerScroll:false});
const view = new View({headerScroll: false});
view.render();
t.ok(view.query('#full-page-wrapper'));
});
2 changes: 1 addition & 1 deletion testpilot/frontend/static-src/test/views/header-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ test('render called on `change:hasAddon` event', t => {
let renderCalled = 0;
const MyView = View.extend({
render() {
renderCalled++
renderCalled++;
View.prototype.render.apply(this, arguments);
}
});
Expand Down

0 comments on commit c1375a2

Please sign in to comment.