ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix quizzes/quizzes_stats_spec.rb in selenium 

refs CNVS-25916

the "app" directory as root is only present for docker users.
we can just remove it from the matchers for jsx loaders
and then these work on jenkins too.

TEST PLAN:
 1) spec/selenium/quizzes/quizzes_stats_spec should pass in selenium
    webpack build

Change-Id: I51f915452de5f4a3f98407d6e3b90a4b18a8671e
Reviewed-on: https://gerrit.instructure.com/70292
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Ethan Vizitei <evizitei@instructure.com>
Tested-by: Ethan Vizitei <evizitei@instructure.com>
This commit is contained in:
Ethan Vizitei 2016-01-14 13:13:50 -07:00 committed by Ethan Vizitei
parent 775e5622ac
commit 4f797398d9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend_build/baseWebpackConfig.js
View File

@ -67,7 +67,7 @@ module.exports = {
{
test: /\.jsx$/,
include: [path.resolve(__dirname, "../app/jsx")],
exclude: [/(node_modules|bower)/, /public\/javascripts\/vendor/, /public\/javascripts\/translations/, /app\/client_apps\/canvas_quizzes\/apps\//],
exclude: [/(node_modules|bower)/, /public\/javascripts\/vendor/, /public\/javascripts\/translations/, /client_apps\/canvas_quizzes\/apps\//],
loaders: [
'babel?cacheDirectory=tmp',
'jsxYankPragma'
@ -75,7 +75,7 @@ module.exports = {
},
{
test: /\.jsx$/,
include: [/app\/client_apps\/canvas_quizzes\/apps\//],
include: [/client_apps\/canvas_quizzes\/apps\//],
exclude: [/(node_modules|bower)/, /public\/javascripts\/vendor/, /public\/javascripts\/translations/, path.resolve(__dirname, "../app/jsx")],
loaders: ["jsx"]
},
@ -151,7 +151,7 @@ module.exports = {
new webpack.IgnorePlugin(/(CHANGELOG|LICENSE|README)$/),
new webpack.IgnorePlugin(/package.json/),
new WebpackOnBuildPlugin(function(stats){
child_process.spawnSync("gulp", ["rev"]);
child_process.spawn("gulp", ["rev"]);
}),
new webpack.PrefetchPlugin("./app/coffeescripts/calendar/ContextSelector.coffee"),
new webpack.PrefetchPlugin("./app/coffeescripts/calendar/TimeBlockRow.coffee"),