diff --git a/cms/static/cms/js/spec/main.js b/cms/static/cms/js/spec/main.js index a60b03862b..e7b09c1ce0 100644 --- a/cms/static/cms/js/spec/main.js +++ b/cms/static/cms/js/spec/main.js @@ -226,7 +226,7 @@ } }); - jasmine.getFixtures().fixturesPath += 'coffee/fixtures'; + jasmine.getFixtures().fixturesPath = '/base/templates'; testFiles = [ 'cms/js/spec/main_spec', diff --git a/cms/static/cms/js/spec/main_squire.js b/cms/static/cms/js/spec/main_squire.js index d088a8c54a..90d1d6b8d6 100644 --- a/cms/static/cms/js/spec/main_squire.js +++ b/cms/static/cms/js/spec/main_squire.js @@ -182,7 +182,7 @@ } }); - jasmine.getFixtures().fixturesPath += 'coffee/fixtures'; + jasmine.getFixtures().fixturesPath = '/base/templates'; testFiles = [ 'coffee/spec/views/assets_spec', diff --git a/cms/static/coffee/fixtures b/cms/static/coffee/fixtures deleted file mode 120000 index 800ce1d60d..0000000000 --- a/cms/static/coffee/fixtures +++ /dev/null @@ -1 +0,0 @@ -../../templates/js/ \ No newline at end of file diff --git a/cms/static/karma_cms.conf.js b/cms/static/karma_cms.conf.js index fefda5da29..effd233d22 100644 --- a/cms/static/karma_cms.conf.js +++ b/cms/static/karma_cms.conf.js @@ -34,7 +34,7 @@ var options = { ], fixtureFiles: [ - {pattern: 'coffee/fixtures/**/*.underscore'}, + {pattern: '../templates/js/**/*.underscore'}, {pattern: 'templates/**/*.underscore'} ],