Merge pull request #71 from NuCivic/fix-circle-template

Fix circle template.
GetDKAN · Jan 16, 2017 · 49164c0 · 49164c0
2 parents 3121559 + 9053fb7
commit 49164c0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.ahoy/site/.scripts/circle.rb b/.ahoy/site/.scripts/circle.rb
@@ -9,8 +9,8 @@ class CircleCIConfig
 
   def initialize config
     default_test_dirs = ["tests/features", "dkan/test/features", "config/tests/features"]
-    @test_dirs = config["default"]["test_dirs"] ? config["default"]["test_dirs"] : default_test_dirs 
-    @memory_limit = config["default"]["memory_limit"] ? config["default"]["memory_limit"] : "256M"
+    @test_dirs = config["circle"]["test_dirs"] ? config["circle"]["test_dirs"] : default_test_dirs
+    @memory_limit = config["circle"]["memory_limit"] ? config["circle"]["memory_limit"] : "256M"
   end
 
   def render(template)

diff --git a/config/config.php b/config/config.php
@@ -79,7 +79,7 @@
     array (
       0 => 'tests/features',
       1 => 'dkan/test/features',
-      2 => 'config/test/features',
+      2 => 'config/tests/features',
     ),
     'memory_limit' => '256M',
   ),

diff --git a/config/config.yml b/config/config.yml
@@ -49,5 +49,5 @@ circle:
   test_dirs:
     - tests/features
     - dkan/test/features
-    - config/test/features
+    - config/tests/features
   memory_limit: 256M