Pass default config to constructor.

moonwave99 · May 30, 2016 · 8b5df40 · 8b5df40
1 parent c48c539
commit 8b5df40
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/index.coffee b/src/index.coffee
@@ -58,6 +58,8 @@ module.exports = class Waffel extends EventEmitter
     server:             false
     watch:              false
     watchInterval:      5000
+    config:
+      env:              'dev'
     markdownOptions:
       gfm:          true
       tables:       true
@@ -95,7 +97,7 @@ module.exports = class Waffel extends EventEmitter
     catch e then @error "Could not locate structureFile: #{@options.structureFile}", e
     site = yaml.safeLoad structureFileContents
 
-    @config = site.config
+    @config = _.extend @options.config, site.config
     @structure = site.structure
 
   getRevision: =>

diff --git a/test/default/_init.coffee b/test/default/_init.coffee
@@ -17,6 +17,8 @@ config = global.config =
   localesFolder:      'locales'
   destinationFolder:  '../public_default'
   structureFile:      'site_default.yml'
+  config:
+    env:  'test'
 
 wfl = global.wfl = new Waffel global.config
 

diff --git a/test/default/config.coffee b/test/default/config.coffee
@@ -6,6 +6,9 @@ config  = global.config
 require 'should-promised'
 
 describe 'Instantiate Waffel', ->
+  it 'should set environment', ->
+    should(wfl.config.env).be.equal global.config.config.env
+
   it 'should set locations', ->
     should(wfl.options.root).be.equal config.root