commit a66d285532d269372f8e91dd6d274544fd309bed parent 02935f7dde07efcf44179e4349304e06e5607378 Author: Emily Eisenberg <emily@khanacademy.org> Date: Thu, 10 Jul 2014 18:28:43 -0700 Switch from using huxley to node-huxley Huxley had some strange problems where screenshots kept getting messed up by becoming different sizes than they were before. Node-huxley seems to have fixed this problem, so we'll try using that instead. Also, fix the sizing tests to the new syntax. Auditors: alpert Diffstat:
66 files changed, 177 insertions(+), 63 deletions(-)
diff --git a/test/huxley/Baseline.hux/firefox-1.png b/test/huxley/Baseline.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/Baseline.hux/record.json b/test/huxley/Baseline.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/Baseline.huxley/record.json b/test/huxley/Baseline.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/Baseline.huxley/screenshot0.png b/test/huxley/Baseline.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/BasicTest.hux/firefox-1.png b/test/huxley/BasicTest.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/BasicTest.hux/record.json b/test/huxley/BasicTest.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/BasicTest.huxley/record.json b/test/huxley/BasicTest.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/BasicTest.huxley/screenshot0.png b/test/huxley/BasicTest.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/Colors.hux/firefox-1.png b/test/huxley/Colors.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/Colors.hux/record.json b/test/huxley/Colors.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/Colors.huxley/record.json b/test/huxley/Colors.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/Colors.huxley/screenshot0.png b/test/huxley/Colors.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/Exponents.hux/firefox-1.png b/test/huxley/Exponents.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/Exponents.hux/record.json b/test/huxley/Exponents.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/Exponents.huxley/record.json b/test/huxley/Exponents.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/Exponents.huxley/screenshot0.png b/test/huxley/Exponents.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/FractionTest.hux/firefox-1.png b/test/huxley/FractionTest.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/FractionTest.hux/record.json b/test/huxley/FractionTest.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/FractionTest.huxley/record.json b/test/huxley/FractionTest.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/FractionTest.huxley/screenshot0.png b/test/huxley/FractionTest.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/Functions.hux/firefox-1.png b/test/huxley/Functions.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/Functions.hux/record.json b/test/huxley/Functions.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/Functions.huxley/record.json b/test/huxley/Functions.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/Functions.huxley/screenshot0.png b/test/huxley/Functions.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/GreekLetters.hux/firefox-1.png b/test/huxley/GreekLetters.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/GreekLetters.hux/record.json b/test/huxley/GreekLetters.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/GreekLetters.huxley/record.json b/test/huxley/GreekLetters.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/GreekLetters.huxley/screenshot0.png b/test/huxley/GreekLetters.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/Huxleyfile b/test/huxley/Huxleyfile @@ -1,47 +0,0 @@ -[BasicTest] -url=http://localhost:7936/test/huxley/test.html?m=a - -[FractionTest] -url=http://localhost:7936/test/huxley/test.html?m=\dfrac{a}{b}\frac{a}{b}\tfrac{a}{b} - -[NestedFractions] -url=http://localhost:7936/test/huxley/test.html?m=\dfrac{\frac{a}{b}}{\frac{c}{d}}\dfrac{\dfrac{a}{b}}{\dfrac{c}{d}}\frac{\frac{a}{b}}{\frac{c}{d}} - -[Exponents] -url=http://localhost:7936/test/huxley/test.html?m=a^{a^a_a}_{a^a_a} - -[Colors] -url=http://localhost:7936/test/huxley/test.html?m=\blue{a}\color{%%230f0}{b}\color{red}{c} - -[GreekLetters] -url=http://localhost:7936/test/huxley/test.html?m=\alpha\beta\gamma\omega - -[Baseline] -url=http://localhost:7936/test/huxley/test.html?m=a+b-c\cdot d/e - -[Spacing] -url=http://localhost:7936/test/huxley/test.html?m=^3+[-1][1-1]1%%3D1(%%3D1)\lvert a\rvert~b - -[Functions] -url=http://localhost:7936/test/huxley/test.html?m=\sin\cos\tan\ln\log - -[Lap] -url=http://localhost:7936/test/huxley/test.html?m=ab\llap{f}cd\rlap{g}h - -[Sizing] -url=http://localhost:7936/test/huxley/test.html?m=\Huge{x}\LARGE{y}\normalsize{z}\scriptsize{w} - -[SizingBaseline] -url=http://localhost:7936/test/huxley/test.html?m=\tiny{a+b}a+b\Huge{a+b}&pre=x&post=M - -[Text] -url=http://localhost:7936/test/huxley/test.html?m=\frac{a}{b}\text{c~ {ab} \ e}+fg - -[KaTeX] -url=http://localhost:7936/test/huxley/test.html?m=\KaTeX - -[RlapBug] -url=http://localhost:7936/test/huxley/test.html?m=\frac{\rlap{x}}{2} - -[SupSubCharacterBox] -url=http://localhost:7936/test/huxley/test.html?m=a_2f_2{f}_2{aa}_2{af}_2 diff --git a/test/huxley/Huxleyfile.json b/test/huxley/Huxleyfile.json @@ -0,0 +1,97 @@ +[ + { + "name": "BasicTest", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=a" + }, + + { + "name": "FractionTest", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=\\dfrac{a}{b}\\frac{a}{b}\\tfrac{a}{b}" + }, + + { + "name": "NestedFractions", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=\\dfrac{\\frac{a}{b}}{\\frac{c}{d}}\\dfrac{\\dfrac{a}{b}}{\\dfrac{c}{d}}\\frac{\\frac{a}{b}}{\\frac{c}{d}}" + }, + + { + "name": "Exponents", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=a^{a^a_a}_{a^a_a}" + }, + + { + "name": "Colors", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=\\blue{a}\\color{%230f0}{b}\\color{red}{c}" + }, + + { + "name": "GreekLetters", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=\\alpha\\beta\\gamma\\omega" + }, + + { + "name": "Baseline", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=a+b-c\\cdot d/e" + }, + + { + "name": "Spacing", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=^3+[-1][1-1]1=1(=1)\\lvert a\\rvert~b" + }, + + { + "name": "Functions", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=\\sin\\cos\\tan\\ln\\log" + }, + + { + "name": "Sizing", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m={\\Huge x}{\\LARGE y}{\\normalsize z}{\\scriptsize w}" + }, + + { + "name": "SizingBaseline", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m={\\tiny a+b}a+b{\\Huge a+b}&pre=x&post=M" + }, + + { + "name": "Text", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=\\frac{a}{b}\\text{c~ {ab} \\ e}+fg" + }, + + { + "name": "KaTeX", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=\\KaTeX" + }, + + { + "name": "RlapBug", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=\\frac{\\rlap{x}}{2}" + }, + + { + "name": "SupSubCharacterBox", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=a_2f_2{f}_2{aa}_2{af}_2" + }, + + { + "name": "Lap", + "screenSize": [1024, 768], + "url": "http://localhost:7936/test/huxley/test.html?m=ab\\llap{f}cd\\rlap{g}h" + } +] diff --git a/test/huxley/KaTeX.hux/firefox-1.png b/test/huxley/KaTeX.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/KaTeX.hux/record.json b/test/huxley/KaTeX.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/KaTeX.huxley/record.json b/test/huxley/KaTeX.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/KaTeX.huxley/screenshot0.png b/test/huxley/KaTeX.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/Lap.hux/firefox-1.png b/test/huxley/Lap.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/Lap.hux/record.json b/test/huxley/Lap.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/Lap.huxley/record.json b/test/huxley/Lap.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/Lap.huxley/screenshot0.png b/test/huxley/Lap.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/NestedFractions.hux/firefox-1.png b/test/huxley/NestedFractions.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/NestedFractions.hux/record.json b/test/huxley/NestedFractions.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/NestedFractions.huxley/record.json b/test/huxley/NestedFractions.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/NestedFractions.huxley/screenshot0.png b/test/huxley/NestedFractions.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/RlapBug.hux/firefox-1.png b/test/huxley/RlapBug.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/RlapBug.hux/record.json b/test/huxley/RlapBug.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/RlapBug.huxley/record.json b/test/huxley/RlapBug.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/RlapBug.huxley/screenshot0.png b/test/huxley/RlapBug.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/Sizing.hux/firefox-1.png b/test/huxley/Sizing.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/Sizing.hux/record.json b/test/huxley/Sizing.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/Sizing.huxley/record.json b/test/huxley/Sizing.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/Sizing.huxley/screenshot0.png b/test/huxley/Sizing.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/SizingBaseline.hux/firefox-1.png b/test/huxley/SizingBaseline.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/SizingBaseline.hux/record.json b/test/huxley/SizingBaseline.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/SizingBaseline.huxley/record.json b/test/huxley/SizingBaseline.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/SizingBaseline.huxley/screenshot0.png b/test/huxley/SizingBaseline.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/Spacing.hux/firefox-1.png b/test/huxley/Spacing.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/Spacing.hux/record.json b/test/huxley/Spacing.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/Spacing.huxley/record.json b/test/huxley/Spacing.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/Spacing.huxley/screenshot0.png b/test/huxley/Spacing.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/SupSubCharacterBox.hux/firefox-1.png b/test/huxley/SupSubCharacterBox.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/SupSubCharacterBox.hux/record.json b/test/huxley/SupSubCharacterBox.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/SupSubCharacterBox.huxley/record.json b/test/huxley/SupSubCharacterBox.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/SupSubCharacterBox.huxley/screenshot0.png b/test/huxley/SupSubCharacterBox.huxley/screenshot0.png Binary files differ. diff --git a/test/huxley/Text.hux/firefox-1.png b/test/huxley/Text.hux/firefox-1.png Binary files differ. diff --git a/test/huxley/Text.hux/record.json b/test/huxley/Text.hux/record.json @@ -0,0 +1,5 @@ +[ + { + "action": "screenshot" + } +] diff --git a/test/huxley/Text.huxley/record.json b/test/huxley/Text.huxley/record.json @@ -1 +0,0 @@ -{"py/object": "huxley.run.Test", "screen_size": {"py/tuple": [1024, 768]}, "steps": [{"py/object": "huxley.steps.ScreenshotTestStep", "index": 0, "offset_time": 0}]} diff --git a/test/huxley/Text.huxley/screenshot0.png b/test/huxley/Text.huxley/screenshot0.png Binary files differ.
