scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2826 from LLK/release/03-07-2019

Browse source 
[develop] Release/03 07 2019
This commit is contained in:
Colby Gutierrez-Kraybill 2019-03-07 13:38:33 -05:00 committed by GitHub
commit 110b2badd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/integration/smoke-testing/test_footer_links.js
View file

@ -281,9 +281,9 @@ tap.test('clickScratchDayLink', options, t => {
// SCRATCH CONFERENCE
tap.test('clickScratchConferenceLink', options, t => {
const linkText = 'Scratch Conference';
const expectedHref = '/conference';
const expectedHref = '/conference/20';
clickFooterLinks(linkText).then(url => {
t.equal(url.substr(-expectedHref.length), expectedHref);
t.match(url.substr(-(expectedHref.length + 2)), expectedHref);
t.end();
});
});

10
webpack.config.js
View file

@ -78,7 +78,11 @@ module.exports = {
{
test: /\.jsx?$/,
loader: 'babel-loader',
include: [path.resolve(__dirname, 'src'), /node_modules[\\/]scratch-[^\\/]+[\\/]src/]
include: [
path.resolve(__dirname, 'src'),
/node_modules[\\/]scratch-[^\\/]+[\\/]src/,
/node_modules[\\/]pify/
]
},
{
test: /\.scss$/,
@ -144,6 +148,10 @@ module.exports = {
from: 'node_modules/scratch-gui/dist/static/blocks-media',
to: 'static/blocks-media'
}]),
new CopyWebpackPlugin([{
from: 'node_modules/scratch-gui/dist/chunks',
to: 'static/chunks'
}]),
new CopyWebpackPlugin([{
from: 'node_modules/scratch-gui/dist/extension-worker.js'
}]),