diff --git a/karma.conf.js b/karma.conf.js index b147a3fcd..cd85f5837 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -16,10 +16,14 @@ module.exports = function(config) { frameworks: ['mocha'], files: [ 'test/index.js', - { pattern: 'public/fonts/icomoon.ttf', included: false, served: true } + { pattern: 'public/fonts/icomoon.ttf', served: true, included: false }, + { pattern: 'public/blank.html', served: true, included: false }, + { pattern: 'test/files/*', served: true, included: false } ], proxies: { - '/fonts/': '/base/public/fonts/' + '/fonts/': '/base/public/fonts/', + '/blank.html': '/base/public/blank.html', + '/test/files/': '/base/test/files/' }, preprocessors: { 'test/index.js': ['webpack', 'sourcemap'] diff --git a/public/blank.html b/public/blank.html new file mode 100644 index 000000000..f588dd3aa --- /dev/null +++ b/public/blank.html @@ -0,0 +1,19 @@ + + + + + + ODK Central + + + diff --git a/src/components/form/show.vue b/src/components/form/show.vue index 8333076d1..769a58328 100644 --- a/src/components/form/show.vue +++ b/src/components/form/show.vue @@ -48,10 +48,10 @@ except according to the terms contained in the LICENSE file.
- - + + @@ -65,7 +65,7 @@ except according to the terms contained in the LICENSE file. - - diff --git a/src/components/form/submission/analyze.vue b/src/components/submission/analyze.vue similarity index 87% rename from src/components/form/submission/analyze.vue rename to src/components/submission/analyze.vue index b85ac1b95..f9edc6352 100644 --- a/src/components/form/submission/analyze.vue +++ b/src/components/submission/analyze.vue @@ -10,11 +10,11 @@ including this file, may be copied, modified, propagated, or distributed except according to the terms contained in the LICENSE file. -->