Fix relative paths and some tests

LianwMS · May 17, 2016 · 67773bd · 67773bd
1 parent 78fd501
commit 67773bd
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 34 deletions.
diff --git a/scripts/components.js b/scripts/components.js
@@ -5,9 +5,6 @@
  * This file helps loading components easier in tests
 */
 
-// Configurations
-require('scripts/config/app.config.js');
-
 // Router
 require('scripts/router');
 

diff --git a/scripts/config/app.config.js b/scripts/config/app.config.js
diff --git a/test/unit/index.js b/test/unit/index.js
@@ -22,29 +22,29 @@ window.SwaggerEditor = angular.module('SwaggerEditor', [
 ]);
 
 // Require app components
-require('../../scripts/components');
+require('scripts/components.js');
 
 // Test config
-require('./defaults.js');
+require('defaults.js');
 
 // Load tests
-require('./spec/controllers/editor');
-require('./spec/controllers/errorpresenter');
-require('./spec/controllers/file-import');
-require('./spec/controllers/main');
-require('./spec/controllers/openexamples');
-require('./spec/controllers/preview');
-require('./spec/controllers/tryoperation');
-require('./spec/controllers/url-import');
+require('spec/controllers/editor');
+require('spec/controllers/errorpresenter');
+require('spec/controllers/file-import');
+require('spec/controllers/main');
+require('spec/controllers/openexamples');
+require('spec/controllers/preview');
+require('spec/controllers/tryoperation');
+require('spec/controllers/url-import');
 
-require('./spec/directives/collapsewhen');
-require('./spec/directives/schemamodel');
+require('spec/directives/collapsewhen');
+require('spec/directives/schemamodel');
 
-require('./spec/services/ast-manager');
-require('./spec/services/autocomplete');
-require('./spec/services/backend');
-require('./spec/services/builder');
-require('./spec/services/editor');
-require('./spec/services/fileloader');
-require('./spec/services/fold-state-manager');
-require('./spec/services/storage');
+require('spec/services/ast-manager');
+require('spec/services/autocomplete');
+require('spec/services/backend');
+require('spec/services/builder');
+require('spec/services/editor');
+require('spec/services/fileloader');
+require('spec/services/fold-state-manager');
+require('spec/services/storage');
diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
@@ -1,6 +1,8 @@
 // Karma configuration
 // http://karma-runner.github.io/0.10/config/configuration-file.html
 
+var path = require("path");
+
 var webpackConfig = require('../../webpack.config.js');
 
 module.exports = function(config) {
@@ -35,6 +37,12 @@ module.exports = function(config) {
     webpack: {
       module: {
         loaders: webpackConfig.module.loaders
+      },
+      resolve: {
+        root: [
+          __dirname,
+          path.join(__dirname, '../../')
+        ]
       }
     },
 

diff --git a/test/unit/spec/directives/schemamodel.js b/test/unit/spec/directives/schemamodel.js
@@ -13,9 +13,12 @@ describe('Directive: schemaModel', function() {
     scope = $rootScope.$new();
   }));
 
-  it('should make hidden element visible', inject(function($compile) {
-    element = angular.element('<schema-model></schema-model>');
+  it('should render', inject(function($compile) {
+    scope.stringSchema = {type: 'string'};
+    element = angular.element(
+      '<schema-model schema="stringSchema"></schema-model>'
+    );
     element = $compile(element)(scope);
-    expect(element.text()).to.equal('');
+    expect(element.text()).to.contain('⇄');
   }));
 });