Move tests into src/js/__tests__

This commit is contained in:
Peter Cottle 2015-03-22 14:42:01 -07:00
parent dfecf68690
commit 4331e4a981
11 changed files with 13 additions and 13 deletions

View file

@ -109,7 +109,7 @@ module.exports = function(grunt) {
jshint: {
all: [
'Gruntfile.js',
'spec/*.js',
'src/__tests__/spec/*.js',
'src/js/**/*.js',
'src/js/**/**/*.js',
'src/levels/**/*.js',
@ -196,7 +196,7 @@ module.exports = function(grunt) {
},
jasmine_node: {
specNameMatcher: 'spec',
projectRoot: '.',
projectRoot: './src/js/__tests__/',
forceExit: true,
verbose: true,
requirejs: false

View file

@ -1,4 +1,4 @@
var AnimationModule = require('../src/js/visuals/animation/index');
var AnimationModule = require('../visuals/animation/index');
var PromiseAnimation = AnimationModule.PromiseAnimation;
var Animation = AnimationModule.Animation;
var Q = require('q');

View file

@ -1,5 +1,5 @@
var HeadlessGit = require('../src/js/git/headless').HeadlessGit;
var TreeCompare = require('../src/js/graph/treeCompare.js');
var HeadlessGit = require('../git/headless').HeadlessGit;
var TreeCompare = require('../graph/treeCompare.js');
var loadTree = function(json) {
return JSON.parse(unescape(json));

View file

@ -1,5 +1,5 @@
var TreeCompare = require('../src/js/graph/treeCompare');
var HeadlessGit = require('../src/js/git/headless').HeadlessGit;
var TreeCompare = require('../graph/treeCompare');
var HeadlessGit = require('../git/headless').HeadlessGit;
var fs = require('fs');
prompt = require('prompt');

View file

@ -3,7 +3,7 @@ var base = require('./base');
describe('GitEngine Levels', function() {
it('solves levels', function() {
var sequences = require('../src/levels/index').levelSequences;
var sequences = require('../../levels/index').levelSequences;
_.each(Object.keys(sequences), function(sequenceKey) {
var levels = sequences[sequenceKey];
_.each(levels, function(levelBlob, index) {

View file

@ -1,4 +1,4 @@
var TreeCompare = require('../src/js/graph/treeCompare');
var TreeCompare = require('../graph/treeCompare');
var _ = require('underscore');
var loadTree = function(treeString) {
@ -112,7 +112,7 @@ describe('Tree Compare', function() {
});
it('compares all branches with hash agnostic', function() {
var selectiveRebaseGoal = require('../src/levels/rebase/selectiveRebase').level.goalTreeString;
var selectiveRebaseGoal = require('../../levels/rebase/selectiveRebase').level.goalTreeString;
testMethod(
{ compareAllBranchesHashAgnostic: true },
selectiveRebaseGoal,
@ -130,7 +130,7 @@ describe('Tree Compare', function() {
});
it('compares only master with hash agnostic', function() {
var manyRebaseGoal = require('../src/levels/rebase/manyRebases').level.goalTreeString;
var manyRebaseGoal = require('../../levels/rebase/manyRebases').level.goalTreeString;
testMethod(
{ compareOnlyMasterHashAgnostic: true },
manyRebaseGoal,
@ -148,7 +148,7 @@ describe('Tree Compare', function() {
});
it('compares only master with hash agnostic and asserts', function() {
var jugglingGoal = require('../src/levels/mixed/jugglingCommits').level.goalTreeString;
var jugglingGoal = require('../../levels/mixed/jugglingCommits').level.goalTreeString;
testMethod(
{
compareOnlyMasterHashAgnosticWithAsserts: true,

View file

@ -1,6 +1,6 @@
var _ = require('underscore');
var Command = require('../src/js/models/commandModel').Command;
var Command = require('../models/commandModel').Command;
describe('commands', function() {
it('replaces . with HEAD correctly', function() {