Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"pretest": "mongodb-runner install",
"test": "xvfb-maybe hadron-build test",
"check": "mongodb-js-precommit ./src/app/*.js ./src/app/**/**/*.js ./src/{app/**/*.js,main/**/*.js} ./test/*.js",
"ci": "npm run test-unit",
"ci": "npm run check && npm run test-unit",
"clean": "hadron-build clean",
"compile-ui": "hadron-build ui",
"fmt": "mongodb-js-fmt ./*.js src/{**/*.js,*.js} test/{**/*.js,*.js}",
Expand Down Expand Up @@ -102,9 +102,9 @@
"font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.4.0.tar.gz",
"get-object-path": "azer/get-object-path#74eb42de0cfd02c14ffdd18552f295aba723d394",
"hadron-action": "^0.1.0",
"hadron-app-registry": "^1.7.0",
"hadron-auto-update-manager": "^0.0.12",
"hadron-compile-cache": "^0.3.0",
"hadron-app-registry": "^1.7.0",
"hadron-document": "^0.22.0",
"hadron-ipc": "^0.0.7",
"hadron-module-cache": "^0.0.3",
Expand All @@ -126,6 +126,7 @@
"mongodb-database-model": "^0.1.2",
"mongodb-explain-plan-model": "^0.2.0",
"mongodb-extended-json": "^1.7.0",
"mongodb-instance-model": "^3.1.5",
"mongodb-js-metrics": "^1.2.0",
"mongodb-language-model": "^0.3.3",
"mongodb-ns": "^1.0.3",
Expand Down Expand Up @@ -156,15 +157,18 @@
"chai": "^3.4.1",
"chai-as-promised": "^5.1.0",
"electron-prebuilt": "1.2.8",
"eslint-config-mongodb-js": "^2.0.1",
"eslint-plugin-react": "^4.1.0",
"eslint-config-mongodb-js": "^2.2.0",
"hadron-build": "^0.7.2",
"mocha": "^2.3.4",
"mongodb-js-precommit": "^0.2.9",
"mongodb-runner": "^3.1.15",
"react-addons-test-utils": "^15.2.1",
"spectron": "^3.2.6",
"xvfb-maybe": "^0.1.3"
},
"precommit": [
"check"
],
"engines": {
"node": "^6.3.0",
"npm": "^3.0.0"
Expand Down
2 changes: 0 additions & 2 deletions src/app/explain-plan/index.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
var View = require('ampersand-view');
var State = require('ampersand-state');

var $ = require('jquery');
var _ = require('lodash');
var app = require('ampersand-app');
var ExplainPlanModel = require('mongodb-explain-plan-model');
var DocumentView = require('../documents/document-list-item');
var IndexDefinitionView = require('../indexes/index-definition');
var TreeView = require('./tree-view');
var StageModel = require('./stage-model');
var metrics = require('mongodb-js-metrics')();

var electron = require('electron');
var shell = electron.shell;
Expand Down
3 changes: 1 addition & 2 deletions src/app/home/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var View = require('ampersand-view');
var format = require('util').format;
var SidebarView = require('../sidebar');
var IdentifyView = require('../identify');
// var IdentifyView = require('../identify');
var CollectionView = require('./collection');
var InstancePropertyView = require('./instance-properties');
var CollectionListItemView = require('./collection-list-item');
Expand All @@ -14,7 +14,6 @@ var _ = require('lodash');
var debug = require('debug')('mongodb-compass:home');
var toNS = require('mongodb-ns');
var ipc = require('hadron-ipc');
var pkg = require('../../../package.json');

var indexTemplate = require('./index.jade');

Expand Down
5 changes: 0 additions & 5 deletions src/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,6 @@ var Application = View.extend({
evt.preventDefault();
evt.stopPropagation();
var id = evt.target.dataset.hook;
var url = 'compass://help';
if (id) {
url += '/' + id;
}

ipc.call('app:show-help-window', id);
},
onClientReady: function() {
Expand Down
1 change: 0 additions & 1 deletion src/app/metrics/features.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
var BaseResource = require('mongodb-js-metrics').resources.BaseResource;
var FeatureResource = require('mongodb-js-metrics').resources.FeatureResource;
var app = require('ampersand-app');
var debug = require('debug')('mongodb-compass:metrics:features');
var _ = require('lodash');

Expand Down
3 changes: 0 additions & 3 deletions src/app/minicharts/d3fns/many.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ var d3 = require('d3');
var $ = require('jquery');
var _ = require('lodash');
var shared = require('./shared');
var app = require('ampersand-app');
var metrics = require('mongodb-js-metrics')();
var ipc = require('hadron-ipc');

var tooltipTemplate = require('./tooltip.jade');
// var debug = require('debug')('mongodb-compass:minicharts:many');
Expand Down
1 change: 0 additions & 1 deletion src/app/models/connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ var DataService = require('mongodb-data-service');
var debug = require('debug')('mongodb-compass:models:connection');
var uuid = require('uuid');
var metrics = require('mongodb-js-metrics')();
var pkg = require('../../../package.json');
var electronApp = require('electron').remote.app;

/**
Expand Down
2 changes: 0 additions & 2 deletions src/app/refine-view/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ var EJSON = require('mongodb-extended-json');
var QueryStore = require('../../internal-packages/schema/lib/store');
var Query = require('mongodb-language-model').Query;
var QueryOptions = require('../models/query-options');
var app = require('ampersand-app');
var metrics = require('mongodb-js-metrics')();

// var metrics = require('mongodb-js-metrics')();
var debug = require('debug')('scout:refine-view:index');
Expand Down
2 changes: 2 additions & 0 deletions src/app/style-manager.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint no-sync: 0 */

var path = require('path');
var LessCache = require('less-cache');

Expand Down
15 changes: 6 additions & 9 deletions test/compass-functional.test.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
'use strict';

process.env.NODE_ENV = 'testing';

const SpectronSupport = require('./support/spectron-support');
const CrudSupport = require('./support/crud-support');
const Connection = require('mongodb-connection-model');
var SpectronSupport = require('./support/spectron-support');
var CrudSupport = require('./support/crud-support');
var Connection = require('mongodb-connection-model');

const DATABASE = 'compass-test';
const COLLECTION = 'bands';
const CONNECTION = new Connection({ hostname: '127.0.0.1', port: 27018, ns: DATABASE });
var DATABASE = 'compass-test';
var COLLECTION = 'bands';
var CONNECTION = new Connection({ hostname: '127.0.0.1', port: 27018, ns: DATABASE });

/**
* Test documents to sample with a local server.
Expand Down Expand Up @@ -103,7 +101,6 @@ describe('Compass #spectron', function() {
});

context('when working in the documents tab', function() {

context('when viewing documents', function() {
it('renders the documents in the list', function() {
return client
Expand Down