You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/09/08 04:47:07 UTC
[50/50] [abbrv] ignite git commit: IGNITE-3629 Review.
IGNITE-3629 Review.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/610ad247
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/610ad247
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/610ad247
Branch: refs/heads/ignite-3629
Commit: 610ad247fdb6aa17998503fcdfe832d13cb2ceac
Parents: af38ae6
Author: Andrey Novikov <an...@apache.org>
Authored: Tue Sep 6 16:28:36 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Tue Sep 6 16:28:36 2016 +0700
----------------------------------------------------------------------
modules/web-console/backend/app/mongoose.js | 2 --
modules/web-console/backend/package.json | 3 +-
.../web-console/backend/test/app/mockgoose.js | 30 +++++++++++++++++
.../backend/test/fixtures/mockgoose.js | 34 --------------------
modules/web-console/backend/test/injector.js | 2 +-
5 files changed, 33 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/610ad247/modules/web-console/backend/app/mongoose.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/app/mongoose.js b/modules/web-console/backend/app/mongoose.js
index 5dba51d..7b6e7f3 100644
--- a/modules/web-console/backend/app/mongoose.js
+++ b/modules/web-console/backend/app/mongoose.js
@@ -24,8 +24,6 @@ module.exports = {
inject: ['require(mongoose)']
};
-
module.exports.factory = (mongoose) => {
return mongoose;
};
-
http://git-wip-us.apache.org/repos/asf/ignite/blob/610ad247/modules/web-console/backend/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/package.json b/modules/web-console/backend/package.json
index 598dc00..f9a8ab0 100644
--- a/modules/web-console/backend/package.json
+++ b/modules/web-console/backend/package.json
@@ -66,6 +66,7 @@
"eslint-friendly-formatter": "^2.0.5",
"jasmine-core": "^2.4.1",
"mocha": "~2.5.3",
- "mocha-teamcity-reporter": "^1.0.0"
+ "mocha-teamcity-reporter": "^1.0.0",
+ "mockgoose": "^6.0.6"
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/610ad247/modules/web-console/backend/test/app/mockgoose.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/test/app/mockgoose.js b/modules/web-console/backend/test/app/mockgoose.js
new file mode 100644
index 0000000..4944f90
--- /dev/null
+++ b/modules/web-console/backend/test/app/mockgoose.js
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+// Fire me up!
+
+module.exports = {
+ implements: 'mongoose:mock',
+ inject: ['require(mongoose)', 'require(mockgoose)']
+};
+
+module.exports.factory = (mongoose, mockgoose) => {
+ return mockgoose(mongoose)
+ .then(() => mongoose);
+};
http://git-wip-us.apache.org/repos/asf/ignite/blob/610ad247/modules/web-console/backend/test/fixtures/mockgoose.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/test/fixtures/mockgoose.js b/modules/web-console/backend/test/fixtures/mockgoose.js
deleted file mode 100644
index 84eb088..0000000
--- a/modules/web-console/backend/test/fixtures/mockgoose.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-// Fire me up!
-
-module.exports = {
- implements: 'mongoose:mock',
- inject: ['mongoose', 'require(mockgoose)']
-};
-
-
-module.exports.factory = (mongoose, mockgoose) => {
- return new Promise((resolve) => {
- mockgoose(mongoose).then(() => resolve(mongoose));
- });
-};
-
-
http://git-wip-us.apache.org/repos/asf/ignite/blob/610ad247/modules/web-console/backend/test/injector.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/test/injector.js b/modules/web-console/backend/test/injector.js
index 3cec9d6..b1dbaf4 100644
--- a/modules/web-console/backend/test/injector.js
+++ b/modules/web-console/backend/test/injector.js
@@ -27,7 +27,7 @@ module.exports = fireUp.newInjector({
'./middlewares/**/*.js',
'./routes/**/*.js',
'./services/**/*.js',
- './test/fixtures/*.js'
+ './test/app/*.js'
],
use: ['mongoose:mock']
});