Merge pull request Semantic-Org#242 from jenweber/master

Bugfix: use addon config options Semantic-Org#238

Author: championswimmer

index.js

@@ -48,7 +48,14 @@ module.exports = {
     if (typeof this._findHost === 'function') {
       app = this._findHost();
     }
-    const options = (app && app.options['SemanticUI']) || (app && app.options['semantic-ui-ember']) || {};
+    let options;
+    if (app && app.options['SemanticUI']) {
+      options = app.options['SemanticUI']
+    } else if (app && app.options['semantic-ui-ember']) {
+      options = app.options['semantic-ui-ember']
+    } else {
+      options = {}
+    }
 
     if (!fs.existsSync(defaults.source.css) && fs.existsSync(custom.source.css)) {
       defaults.source = custom.source

tape-tests/utils/get-default-test.js

@@ -22,6 +22,12 @@ var defaults = function() {
   };
 };
 
+let customOptions = {
+  import: {
+    css: false
+  }
+}
+
 test('use the default path of the theme if not in the options', function (assert) {
   assert.plan(4);
   assert.equal(getDefault('paths', 'theme', [{}, defaults()]), 'default');
@@ -63,3 +69,8 @@ test('use old default location of imports', function (assert) {
   assert.plan(1);
   assert.equal(getDefault('imports', 'fonts', [oldDefaults, defaults()]), false);
 });
+
+test('user-defined options are read', function (assert) {
+  assert.plan(1);
+  assert.equal(getDefault('import', 'css', [customOptions]), false);
+});