mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-20 21:35:42 +02:00
Move tests to the root
This commit is contained in:
parent
5d46a6ecd2
commit
e068203893
16 changed files with 25 additions and 37 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -17,10 +17,6 @@ index.html
|
|||
# Annoying mac stuff
|
||||
.DS_STORE
|
||||
|
||||
# Casper stuff
|
||||
src/__tests__/casperjs/screenshots/*.png
|
||||
src/__tests__/casperjs/*.js-e
|
||||
|
||||
# Xcode
|
||||
*.xcuserstate
|
||||
*.xcworkspace
|
||||
|
|
20
Gruntfile.js
20
Gruntfile.js
|
@ -107,7 +107,7 @@ module.exports = function(grunt) {
|
|||
jshint: {
|
||||
all: [
|
||||
'Gruntfile.js',
|
||||
'src/__tests__/spec/*.js',
|
||||
'__tests__/*.spec.js',
|
||||
'src/js/**/*.js',
|
||||
'src/js/**/**/*.js',
|
||||
'src/levels/**/*.js'
|
||||
|
@ -202,32 +202,24 @@ module.exports = function(grunt) {
|
|||
}
|
||||
},
|
||||
jasmine_node: {
|
||||
projectRoot: './src/js/__tests__/',
|
||||
projectRoot: './__tests__/',
|
||||
forceExit: true,
|
||||
verbose: true,
|
||||
requirejs: false
|
||||
},
|
||||
browserify: {
|
||||
options: {
|
||||
transform: [require('grunt-react').browserify],
|
||||
ignore: [
|
||||
'src/js/__tests__/create.js',
|
||||
'src/js/__tests__/*.js',
|
||||
'src/js/native_react_views/*.js',
|
||||
'src/js/**/*.ios.js'
|
||||
]
|
||||
transform: [require('grunt-react').browserify]
|
||||
},
|
||||
dist: {
|
||||
files: {
|
||||
'build/bundle.js': [
|
||||
'src/**/*.js',
|
||||
'src/**/*.jsx',
|
||||
'src/js/**/*.js',
|
||||
'src/js/**/*.jsx'
|
||||
'src/**/*.jsx'
|
||||
]
|
||||
},
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
// all my npm helpers
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
var CommandLineActions = require('../actions/CommandLineActions');
|
||||
var CommandLineStore = require('../stores/CommandLineStore');
|
||||
var CommandLineActions = require('../src/js/actions/CommandLineActions');
|
||||
var CommandLineStore = require('../src/js/stores/CommandLineStore');
|
||||
|
||||
describe('this store', function() {
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
var GlobalStateActions = require('../actions/GlobalStateActions');
|
||||
var GlobalStateStore = require('../stores/GlobalStateStore');
|
||||
var GlobalStateActions = require('../src/js/actions/GlobalStateActions');
|
||||
var GlobalStateStore = require('../src/js/stores/GlobalStateStore');
|
||||
|
||||
describe('this store', function() {
|
||||
it('is can change animating', function() {
|
|
@ -1,5 +1,5 @@
|
|||
var LevelActions = require('../actions/LevelActions');
|
||||
var LevelStore = require('../stores/LevelStore');
|
||||
var LevelActions = require('../src/js/actions/LevelActions');
|
||||
var LevelStore = require('../src/js/stores/LevelStore');
|
||||
|
||||
describe('this store', function() {
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
var LocaleActions = require('../actions/LocaleActions');
|
||||
var LocaleStore = require('../stores/LocaleStore');
|
||||
var LocaleActions = require('../src/js/actions/LocaleActions');
|
||||
var LocaleStore = require('../src/js/stores/LocaleStore');
|
||||
|
||||
describe('LocaleStore', function() {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
var AnimationModule = require('../visuals/animation/index');
|
||||
var AnimationModule = require('../src/js/visuals/animation/index');
|
||||
var PromiseAnimation = AnimationModule.PromiseAnimation;
|
||||
var Animation = AnimationModule.Animation;
|
||||
var Q = require('q');
|
|
@ -1,5 +1,5 @@
|
|||
var HeadlessGit = require('../git/headless').HeadlessGit;
|
||||
var TreeCompare = require('../graph/treeCompare.js');
|
||||
var HeadlessGit = require('../src/js/git/headless').HeadlessGit;
|
||||
var TreeCompare = require('../src/js/graph/treeCompare.js');
|
||||
|
||||
var loadTree = function(json) {
|
||||
return JSON.parse(unescape(json));
|
|
@ -1,5 +1,5 @@
|
|||
var TreeCompare = require('../graph/treeCompare');
|
||||
var HeadlessGit = require('../git/headless').HeadlessGit;
|
||||
var TreeCompare = require('../src/js/graph/treeCompare');
|
||||
var HeadlessGit = require('../src/js/git/headless').HeadlessGit;
|
||||
|
||||
var fs = require('fs');
|
||||
prompt = require('prompt');
|
|
@ -2,7 +2,7 @@ var base = require('./base');
|
|||
|
||||
describe('GitEngine Levels', function() {
|
||||
it('solves levels', function() {
|
||||
var sequences = require('../../levels/index').levelSequences;
|
||||
var sequences = require('../src/levels/index').levelSequences;
|
||||
Object.keys(sequences).forEach(function(sequenceKey) {
|
||||
var levels = sequences[sequenceKey];
|
||||
Object.keys(levels).forEach(function(index) {
|
|
@ -1,4 +1,4 @@
|
|||
var TreeCompare = require('../graph/treeCompare');
|
||||
var TreeCompare = require('../src/js/graph/treeCompare');
|
||||
|
||||
var loadTree = function(treeString) {
|
||||
return TreeCompare.convertTreeSafe(treeString);
|
||||
|
@ -112,7 +112,7 @@ describe('Tree Compare', function() {
|
|||
});
|
||||
|
||||
it('compares all branches with hash agnostic', function() {
|
||||
var selectiveRebaseGoal = require('../../levels/rebase/selectiveRebase').level.goalTreeString;
|
||||
var selectiveRebaseGoal = require('../src/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('../../levels/rebase/manyRebases').level.goalTreeString;
|
||||
var manyRebaseGoal = require('../src/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('../../levels/mixed/jugglingCommits').level.goalTreeString;
|
||||
var jugglingGoal = require('../src/levels/mixed/jugglingCommits').level.goalTreeString;
|
||||
testMethod(
|
||||
{
|
||||
compareOnlyMasterHashAgnosticWithAsserts: true,
|
|
@ -1,4 +1,4 @@
|
|||
var Command = require('../models/commandModel').Command;
|
||||
var Command = require('../src/js/models/commandModel').Command;
|
||||
|
||||
describe('commands', function() {
|
||||
it('replaces . with HEAD correctly', function() {
|
Loading…
Add table
Add a link
Reference in a new issue