Merge branch 'feature/deploy-favicon-ours'
@@ -15,6 +15,7 @@ ROOT = Path(__file__).resolve().parents[1]
15
15
# folder, or a folder that already only contains a previous Meteors deploy.
16
16
OURS = {
17
17
'index.html', 'game.js', 'framework.js', 'style.css', 'images',
18
'favicon.ico',
18
19
'.', '..',
19
20
}
20
21
@@ -15,6 +15,7 @@ ROOT = Path(__file__).resolve().parents[1]15
# folder, or a folder that already only contains a previous Meteors deploy.15
# folder, or a folder that already only contains a previous Meteors deploy.16
OURS = {16
OURS = {17
'index.html', 'game.js', 'framework.js', 'style.css', 'images',17
'index.html', 'game.js', 'framework.js', 'style.css', 'images',18
'favicon.ico',18
'.', '..',19
'.', '..',19
}20
}20
21
@@ -80,7 +80,7 @@ describe('assert_safe_target', () =>
80
80
'from deploy import assert_safe_target',
81
81
'assert_safe_target(False, [])',
82
82
'assert_safe_target(True, [])',
83
'assert_safe_target(True, ["index.html", "game.js", "framework.js", "style.css", "images"])',
83
'assert_safe_target(True, ["index.html", "game.js", "framework.js", "style.css", "images", "favicon.ico"])',
84
84
'try:',
85
85
' assert_safe_target(True, ["index.php", "wp-config.php"])',
86
86
' raise SystemExit("should have refused")',
@@ -80,7 +80,7 @@ describe('assert_safe_target', () =>80
'from deploy import assert_safe_target',80
'from deploy import assert_safe_target',81
'assert_safe_target(False, [])',81
'assert_safe_target(False, [])',82
'assert_safe_target(True, [])',82
'assert_safe_target(True, [])',83
'assert_safe_target(True, ["index.html", "game.js", "framework.js", "style.css", "images"])',83
'assert_safe_target(True, ["index.html", "game.js", "framework.js", "style.css", "images", "favicon.ico"])',84
'try:',84
'try:',85
' assert_safe_target(True, ["index.php", "wp-config.php"])',85
' assert_safe_target(True, ["index.php", "wp-config.php"])',86
' raise SystemExit("should have refused")',86
' raise SystemExit("should have refused")',