This repository has been archived by the owner on Sep 6, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3300 from TomMalbran/tom/font-size-2
Fixing the adjust font restore scroll and adding unit tests
- Loading branch information
Showing
5 changed files
with
230 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .testClass { | ||
| color: red; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <!doctype html> | ||
| <html> | ||
| <head> | ||
| <title>Simple Test</title> | ||
| <link rel="stylesheet" href="test.css"> | ||
| </head> | ||
|
|
||
| <body> | ||
| <p class="testClass">Brackets is awesome!</p> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| /* | ||
| * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a | ||
| * copy of this software and associated documentation files (the "Software"), | ||
| * to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| * and/or sell copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| * DEALINGS IN THE SOFTWARE. | ||
| * | ||
| */ | ||
|
|
||
| /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ | ||
| /*global define, describe, beforeEach, it, runs, expect, waitsForDone */ | ||
|
|
||
| define(function (require, exports, module) { | ||
| "use strict"; | ||
|
|
||
| var CommandManager, // loaded from brackets.test | ||
| Commands, // loaded from brackets.test | ||
| EditorManager, // loaded from brackets.test | ||
| FileViewController, | ||
| SpecRunnerUtils = require("spec/SpecRunnerUtils"); | ||
|
|
||
| describe("ViewCommandHandlers", function () { | ||
| this.category = "integration"; | ||
|
|
||
| var testPath = SpecRunnerUtils.getTestPath("/spec/ViewCommandHandlers-test-files"), | ||
| testWindow; | ||
|
|
||
| var CSS_FILE = testPath + "/test.css", | ||
| HTML_FILE = testPath + "/test.html"; | ||
|
|
||
| beforeEach(function () { | ||
| var promise; | ||
|
|
||
| // Create a new window that will be shared by ALL tests in this spec. | ||
| if (!testWindow) { | ||
| SpecRunnerUtils.createTestWindowAndRun(this, function (w) { | ||
| testWindow = w; | ||
|
|
||
| // Load module instances from brackets.test | ||
| CommandManager = testWindow.brackets.test.CommandManager; | ||
| Commands = testWindow.brackets.test.Commands; | ||
| EditorManager = testWindow.brackets.test.EditorManager; | ||
| FileViewController = testWindow.brackets.test.FileViewController; | ||
|
|
||
| SpecRunnerUtils.loadProjectInTestWindow(testPath); | ||
| }); | ||
|
|
||
| runs(function () { | ||
| promise = CommandManager.execute(Commands.FILE_ADD_TO_WORKING_SET, {fullPath: HTML_FILE}); | ||
| waitsForDone(promise, "Open into working set"); | ||
| }); | ||
|
|
||
| runs(function () { | ||
| // Open inline editor onto test.css's ".testClass" rule | ||
| promise = SpecRunnerUtils.toggleQuickEditAtOffset(EditorManager.getCurrentFullEditor(), {line: 8, ch: 11}); | ||
| waitsForDone(promise, "Open inline editor"); | ||
| }); | ||
| } | ||
| }); | ||
|
|
||
| function getEditors() { | ||
| var editor = EditorManager.getCurrentFullEditor(); | ||
| return { | ||
| editor: editor, | ||
| inline: editor.getInlineWidgets()[0].editors[0] | ||
| }; | ||
| } | ||
|
|
||
|
|
||
| describe("Adjust the Font Size", function () { | ||
| it("should increase the font size in both editor and inline editor", function () { | ||
| runs(function () { | ||
| var editors = getEditors(); | ||
| var expectedSize = editors.editor.getTextHeight() + 2; | ||
|
|
||
| CommandManager.execute(Commands.VIEW_INCREASE_FONT_SIZE); | ||
| CommandManager.execute(Commands.VIEW_INCREASE_FONT_SIZE); | ||
|
|
||
| expect(editors.editor.getTextHeight()).toBe(expectedSize); | ||
| expect(editors.inline.getTextHeight()).toBe(expectedSize); | ||
| }); | ||
| }); | ||
|
|
||
| it("should decrease the font size in both editor and inline editor", function () { | ||
| runs(function () { | ||
| var editors = getEditors(); | ||
| var expectedSize = editors.editor.getTextHeight() - 2; | ||
|
|
||
| CommandManager.execute(Commands.VIEW_DECREASE_FONT_SIZE); | ||
| CommandManager.execute(Commands.VIEW_DECREASE_FONT_SIZE); | ||
|
|
||
| expect(editors.editor.getTextHeight()).toBe(expectedSize); | ||
| expect(editors.inline.getTextHeight()).toBe(expectedSize); | ||
| }); | ||
| }); | ||
|
|
||
| it("should restore the font size in both editor and inline editor", function () { | ||
| runs(function () { | ||
| var editors = getEditors(); | ||
| var expectedSize = editors.editor.getTextHeight(); | ||
|
|
||
| CommandManager.execute(Commands.VIEW_INCREASE_FONT_SIZE); | ||
| CommandManager.execute(Commands.VIEW_INCREASE_FONT_SIZE); | ||
| CommandManager.execute(Commands.VIEW_RESTORE_FONT_SIZE); | ||
|
|
||
| expect(editors.editor.getTextHeight()).toBe(expectedSize); | ||
| expect(editors.inline.getTextHeight()).toBe(expectedSize); | ||
| }); | ||
| }); | ||
|
|
||
| it("should keep the same font size when opening another document", function () { | ||
| var promise, expectedSize, editor; | ||
|
|
||
| runs(function () { | ||
| editor = EditorManager.getCurrentFullEditor(); | ||
| expectedSize = editor.getTextHeight() + 1; | ||
|
|
||
| promise = CommandManager.execute(Commands.VIEW_INCREASE_FONT_SIZE); | ||
| waitsForDone(promise, "Increase font size"); | ||
| }); | ||
|
|
||
| runs(function () { | ||
| // Open another document and bring it to the front | ||
| waitsForDone(FileViewController.openAndSelectDocument(CSS_FILE, FileViewController.PROJECT_MANAGER), | ||
| "FILE_OPEN on file timeout", 1000); | ||
| }); | ||
|
|
||
| runs(function () { | ||
| editor = EditorManager.getCurrentFullEditor(); | ||
| expect(editor.getTextHeight()).toBe(expectedSize); | ||
| }); | ||
|
|
||
| // This must be in the last spec in the suite. | ||
| runs(function () { | ||
| this.after(function () { | ||
| SpecRunnerUtils.closeTestWindow(); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); |