Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00
Code Issues Activity

Merge pull request #5449 from jaswilli/issue-5411

Browse source 
Ensure sqlite3 uses a single database connection
This commit is contained in:
Sebastian Gierlinger 2015-06-18 08:37:22 +02:00
commit 7adad8da9d
1 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/test/integration/import_spec.js
View file

@ -10,14 +10,14 @@ var testUtils = require('../utils/index'),
validator = require('validator'), validator = require('validator'),
// Stuff we are testing // Stuff we are testing
config = rewire('../../server/config'), config = require('../../server/config'),
defaultConfig = rewire('../../../config.example')[process.env.NODE_ENV], defaultConfig = rewire('../../../config.example')[process.env.NODE_ENV],
migration = rewire('../../server/data/migration'), migration = rewire('../../server/data/migration'),
exporter = require('../../server/data/export'), exporter = require('../../server/data/export'),
importer = require('../../server/data/import'), importer = require('../../server/data/import'),
DataImporter = require('../../server/data/import/data-importer'), DataImporter = require('../../server/data/import/data-importer'),
knex, knex = config.database.knex,
sandbox = sinon.sandbox.create(); sandbox = sinon.sandbox.create();
// Tests in here do an import for each test // Tests in here do an import for each test
@ -38,7 +38,6 @@ describe('Import', function () {
migration.__get__('config', newConfig); migration.__get__('config', newConfig);
config.set(newConfig); config.set(newConfig);
knex = config.database.knex;
}); });
it('resolves DataImporter', function (done) { it('resolves DataImporter', function (done) {
@ -58,9 +57,6 @@ describe('Import', function () {
}); });
describe('Sanitizes', function () { describe('Sanitizes', function () {
before(function () {
knex = config.database.knex;
});
beforeEach(testUtils.setup('roles', 'owner', 'settings')); beforeEach(testUtils.setup('roles', 'owner', 'settings'));
it('import results have data and problems', function (done) { it('import results have data and problems', function (done) {
@ -122,9 +118,6 @@ describe('Import', function () {
}); });
describe('DataImporter', function () { describe('DataImporter', function () {
before(function () {
knex = config.database.knex;
});
beforeEach(testUtils.setup('roles', 'owner', 'settings')); beforeEach(testUtils.setup('roles', 'owner', 'settings'));
should.exist(DataImporter); should.exist(DataImporter);
@ -332,9 +325,6 @@ describe('Import', function () {
}); });
describe('002', function () { describe('002', function () {
before(function () {
knex = config.database.knex;
});
beforeEach(testUtils.setup('roles', 'owner', 'settings')); beforeEach(testUtils.setup('roles', 'owner', 'settings'));
it('safely imports data from 002', function (done) { it('safely imports data from 002', function (done) {
@ -497,9 +487,6 @@ describe('Import', function () {
}); });
describe('003', function () { describe('003', function () {
before(function () {
knex = config.database.knex;
});
beforeEach(testUtils.setup('roles', 'owner', 'settings')); beforeEach(testUtils.setup('roles', 'owner', 'settings'));
it('safely imports data from 003 (single user)', function (done) { it('safely imports data from 003 (single user)', function (done) {
@ -675,8 +662,6 @@ describe('Import (new test structure)', function () {
var exportData; var exportData;
before(function doImport(done) { before(function doImport(done) {
knex = config.database.knex;
testUtils.initFixtures('roles', 'owner', 'settings').then(function () { testUtils.initFixtures('roles', 'owner', 'settings').then(function () {
return testUtils.fixtures.loadExportFixture('export-003-mu'); return testUtils.fixtures.loadExportFixture('export-003-mu');
}).then(function (exported) { }).then(function (exported) {
@ -902,8 +887,6 @@ describe('Import (new test structure)', function () {
var exportData; var exportData;
before(function doImport(done) { before(function doImport(done) {
knex = config.database.knex;
testUtils.initFixtures('roles', 'owner', 'settings').then(function () { testUtils.initFixtures('roles', 'owner', 'settings').then(function () {
return testUtils.fixtures.loadExportFixture('export-003-mu-noOwner'); return testUtils.fixtures.loadExportFixture('export-003-mu-noOwner');
}).then(function (exported) { }).then(function (exported) {
@ -1129,8 +1112,6 @@ describe('Import (new test structure)', function () {
var exportData; var exportData;
before(function doImport(done) { before(function doImport(done) {
knex = config.database.knex;
// initialise the blog with some data // initialise the blog with some data
testUtils.initFixtures('users:roles', 'posts', 'settings').then(function () { testUtils.initFixtures('users:roles', 'posts', 'settings').then(function () {
return testUtils.fixtures.loadExportFixture('export-003-mu'); return testUtils.fixtures.loadExportFixture('export-003-mu');
@ -1363,8 +1344,6 @@ describe('Import (new test structure)', function () {
var exportData; var exportData;
before(function doImport(done) { before(function doImport(done) {
knex = config.database.knex;
// initialise the blog with some data // initialise the blog with some data
testUtils.initFixtures('users:roles', 'posts', 'settings').then(function () { testUtils.initFixtures('users:roles', 'posts', 'settings').then(function () {
return testUtils.fixtures.loadExportFixture('export-003-mu-multipleOwner'); return testUtils.fixtures.loadExportFixture('export-003-mu-multipleOwner');