Merge pull request #6731 from WebsiteDeveloper/fixCodeInspectionTests

ingorichter · ingorichter · commit 86d1870a9f57 · 2014-02-12T16:00:59.000-08:00
Fix CodeInspection Integration tests for non english locales
diff --git a/test/spec/CodeInspection-test.js b/test/spec/CodeInspection-test.js
@@ -28,7 +28,9 @@ define(function (require, exports, module) {
     "use strict";
 
     var SpecRunnerUtils  = require("spec/SpecRunnerUtils"),
-        FileSystem       = require("filesystem/FileSystem");
+        FileSystem       = require("filesystem/FileSystem"),
+        StringUtils      = require("utils/StringUtils"),
+        Strings;
 
     describe("Code Inspection", function () {
         this.category = "integration";
@@ -83,6 +85,7 @@ define(function (require, exports, module) {
                     // Load module instances from brackets.test
                     $ = testWindow.$;
                     brackets = testWindow.brackets;
+                    Strings = testWindow.require("strings");
                     CommandManager = brackets.test.CommandManager;
                     EditorManager = brackets.test.EditorManager;
                     CodeInspection = brackets.test.CodeInspection;
@@ -393,13 +396,13 @@ define(function (require, exports, module) {
 
                 runs(function () {
                     var $problemPanelTitle = $("#problems-panel .title").text();
-                    expect($problemPanelTitle).toBe("1 JavaScript Linter Problem");
+                    expect($problemPanelTitle).toBe(StringUtils.format(Strings.SINGLE_ERROR, "JavaScript Linter"));
 
                     var $statusBar = $("#status-inspection");
                     expect($statusBar.is(":visible")).toBe(true);
 
                     var tooltip = $statusBar.attr("title");
-                    expect(tooltip).toBe("1 JavaScript Linter Problem");
+                    expect(tooltip).toBe(StringUtils.format(Strings.SINGLE_ERROR, "JavaScript Linter"));
                 });
             });
 
@@ -426,13 +429,13 @@ define(function (require, exports, module) {
 
                 runs(function () {
                     var $problemPanelTitle = $("#problems-panel .title").text();
-                    expect($problemPanelTitle).toBe("2 JavaScript Linter Problems");
+                    expect($problemPanelTitle).toBe(StringUtils.format(Strings.MULTIPLE_ERRORS, "JavaScript Linter", 2));
 
                     var $statusBar = $("#status-inspection");
                     expect($statusBar.is(":visible")).toBe(true);
 
                     var tooltip = $statusBar.attr("title");
-                    expect(tooltip).toBe("2 JavaScript Linter Problems");
+                    expect(tooltip).toBe(StringUtils.format(Strings.MULTIPLE_ERRORS, "JavaScript Linter", 2));
                 });
             });
 
@@ -448,14 +451,14 @@ define(function (require, exports, module) {
 
                 runs(function () {
                     var $problemPanelTitle = $("#problems-panel .title").text();
-                    expect($problemPanelTitle).toBe("2 Problems");
+                    expect($problemPanelTitle).toBe(StringUtils.format(Strings.ERRORS_PANEL_TITLE_MULTIPLE, 2));
 
                     var $statusBar = $("#status-inspection");
                     expect($statusBar.is(":visible")).toBe(true);
 
                     var tooltip = $statusBar.attr("title");
                     // tooltip will contain + in the title if the inspection was aborted
-                    expect(tooltip).toBe("2 Problems");
+                    expect(tooltip).toBe(StringUtils.format(Strings.ERRORS_PANEL_TITLE_MULTIPLE, 2));
                 });
             });
 
@@ -472,7 +475,7 @@ define(function (require, exports, module) {
                     expect($statusBar.is(":visible")).toBe(true);
 
                     var tooltip = $statusBar.attr("title");
-                    expect(tooltip).toBe("No problems found - good job!");
+                    expect(tooltip).toBe(Strings.NO_ERRORS_MULTIPLE_PROVIDER);
                 });
             });
 
@@ -487,7 +490,7 @@ define(function (require, exports, module) {
                     expect($statusBar.is(":visible")).toBe(true);
 
                     var tooltip = $statusBar.attr("title");
-                    expect(tooltip).toBe("No JavaScript Linter1 problems found - good job!");
+                    expect(tooltip).toBe(StringUtils.format(Strings.NO_ERRORS, "JavaScript Linter1"));
                 });
             });
             
@@ -563,13 +566,13 @@ define(function (require, exports, module) {
 
                 runs(function () {
                     var $problemPanelTitle = $("#problems-panel .title").text();
-                    expect($problemPanelTitle).toBe("2 Problems");
+                    expect($problemPanelTitle).toBe(StringUtils.format(Strings.ERRORS_PANEL_TITLE_MULTIPLE, 2));
 
                     var $statusBar = $("#status-inspection");
                     expect($statusBar.is(":visible")).toBe(true);
 
                     var tooltip = $statusBar.attr("title");
-                    expect(tooltip).toBe("2 Problems");
+                    expect(tooltip).toBe(StringUtils.format(Strings.ERRORS_PANEL_TITLE_MULTIPLE, 2));
                 });
             });
         });
