Skip to content

Commit

Permalink
Prep for v0.9.3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@a85
a85 committed Oct 26, 2013
1 parent 14f05e8 commit c744d43
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 16 deletions.
1 change: 0 additions & 1 deletion chrome/html/requester/footer.html
View file
Expand Up @@ -15,7 +15,6 @@
<script type="text/javascript" src="js/libs/jquery.hotkeys.js"></script>
<script type="text/javascript" src="js/libs/jquery.mousewheel.js"></script>
<script type="text/javascript" src="js/libs/jquery.timeago.js"></script>
<script type="text/javascript" src="js/libs/flippant.min.js"></script>

<!-- Bootstrap -->
<script type="text/javascript" src="js/libs/bootstrap.min.js"></script>
Expand Down
1 change: 0 additions & 1 deletion chrome/html/requester/header.html
View file
Expand Up @@ -6,7 +6,6 @@
<link rel="stylesheet" type="text/css" href="css/custom-theme/jquery-ui-1.9.2.custom.min.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap-modal.css"/>
<link rel="stylesheet" type="text/css" href="css/jquery.jscrollpane.css"/>
<link rel="stylesheet" type="text/css" href="js/libs/codemirror/lib/codemirror.css"/>
<link rel="stylesheet" type="text/css" href="js/libs/codemirror/theme/eclipse.css"/>
<link rel="stylesheet" type="text/css" href="js/libs/codemirror/lib/util/dialog.css"/>
Expand Down
4 changes: 2 additions & 2 deletions chrome/html/requester/tester.html
View file
Expand Up @@ -6,11 +6,11 @@
<script type="text/javascript" src="tests/libs/jasmine-1.3.1/jasmine-html.js"></script>
<script type="text/javascript" src="tests/mocks/mocks.js"></script>
<script type="text/javascript" src="tests/tester.js"></script>
<!-- <script type="text/javascript" src="tests/init.js"></script>
<script type="text/javascript" src="tests/init.js"></script>
<script type="text/javascript" src="tests/specs/HistorySpec.js"></script>
<script type="text/javascript" src="tests/specs/FoldersSpec.js"></script>
<script type="text/javascript" src="tests/specs/CollectionsSpec.js"></script>
<script type="text/javascript" src="tests/specs/RequestsSpec.js"></script>
<script type="text/javascript" src="tests/specs/RequestsWithVariablesSpec.js"></script> -->
<script type="text/javascript" src="tests/specs/RequestsWithVariablesSpec.js"></script>
<script type="text/javascript" src="tests/specs/HelpersSpec.js"></script>
<script type="text/javascript" src="tests/specs/UtilSpec.js"></script>
Binary file modified chrome/icon.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified chrome/icon_128.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified chrome/icon_16.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified chrome/icon_32.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified chrome/icon_48.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion chrome/js/config.js
View file
Expand Up @@ -7,7 +7,7 @@ var POSTMAN_INDEXED_DB_TESTING = "postman_test";

// Config variables
var postman_flag_is_testing = false;
var postman_web_url = POSTMAN_WEB_URL_LOCAL;
var postman_web_url = POSTMAN_WEB_URL_PRODUCTION;

var postman_database_name;

Expand Down
6 changes: 2 additions & 4 deletions chrome/tester.html
View file
Expand Up @@ -6,7 +6,6 @@
<link rel="stylesheet" type="text/css" href="css/custom-theme/jquery-ui-1.9.2.custom.min.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap-modal.css"/>
<link rel="stylesheet" type="text/css" href="css/jquery.jscrollpane.css"/>
<link rel="stylesheet" type="text/css" href="js/libs/codemirror/lib/codemirror.css"/>
<link rel="stylesheet" type="text/css" href="js/libs/codemirror/theme/eclipse.css"/>
<link rel="stylesheet" type="text/css" href="js/libs/codemirror/lib/util/dialog.css"/>
Expand Down Expand Up @@ -1843,7 +1842,6 @@ <h4>Sync log</h4>
<script type="text/javascript" src="js/libs/jquery.hotkeys.js"></script>
<script type="text/javascript" src="js/libs/jquery.mousewheel.js"></script>
<script type="text/javascript" src="js/libs/jquery.timeago.js"></script>
<script type="text/javascript" src="js/libs/flippant.min.js"></script>

<!-- Bootstrap -->
<script type="text/javascript" src="js/libs/bootstrap.min.js"></script>
Expand Down Expand Up @@ -1904,11 +1902,11 @@ <h4>Sync log</h4>
<script type="text/javascript" src="tests/libs/jasmine-1.3.1/jasmine-html.js"></script>
<script type="text/javascript" src="tests/mocks/mocks.js"></script>
<script type="text/javascript" src="tests/tester.js"></script>
<!-- <script type="text/javascript" src="tests/init.js"></script>
<script type="text/javascript" src="tests/init.js"></script>
<script type="text/javascript" src="tests/specs/HistorySpec.js"></script>
<script type="text/javascript" src="tests/specs/FoldersSpec.js"></script>
<script type="text/javascript" src="tests/specs/CollectionsSpec.js"></script>
<script type="text/javascript" src="tests/specs/RequestsSpec.js"></script>
<script type="text/javascript" src="tests/specs/RequestsWithVariablesSpec.js"></script> -->
<script type="text/javascript" src="tests/specs/RequestsWithVariablesSpec.js"></script>
<script type="text/javascript" src="tests/specs/HelpersSpec.js"></script>
<script type="text/javascript" src="tests/specs/UtilSpec.js"></script>
12 changes: 6 additions & 6 deletions chrome/tests/specs/HistorySpec.js
View file
Expand Up @@ -36,12 +36,12 @@ describe("History ", function() {
runs(function() {
setTimeout(function() {
mockDataLoaded = pm.tester.historyHasString("http://localhost:5000/get");
}, 100);
}, 200);
});

waitsFor(function() {
return mockDataLoaded === true;
}, "Mock data not loaded", 100);
}, "Mock data not loaded", 250);

runs(function() {
pm.request.on("loadRequest", function() {
Expand Down Expand Up @@ -71,12 +71,12 @@ describe("History ", function() {
runs(function() {
setTimeout(function() {
mockDataLoaded = pm.tester.historyHasString("http://localhost:5000/post");
}, 100);
}, 250);
});

waitsFor(function() {
return mockDataLoaded === true;
}, "Mock data not loaded", 100);
}, "Mock data not loaded", 250);

runs(function() {
pm.request.on("loadRequest", function() {
Expand Down Expand Up @@ -107,7 +107,7 @@ describe("History ", function() {
runs(function() {
setTimeout(function() {
mockDataLoaded = pm.tester.historyHasString("http://localhost:5000/post");
}, 100);
}, 150);
});

waitsFor(function() {
Expand All @@ -123,7 +123,7 @@ describe("History ", function() {

waitsFor(function() {
return historyItemLoaded === true;
}, "History item not loaded", 200);
}, "History item not loaded", 250);

runs(function() {
expect(pm.tester.urlHasString("http://localhost:5000/post")).toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion chrome/tests/specs/RequestsSpec.js
View file
Expand Up @@ -214,7 +214,7 @@ describe("Postman requester", function() {
}, "Could not get response", waitTime);

runs(function() {
var foundString = pm.tester.prettyBodyHasString("some=start;val");
var foundString = pm.tester.prettyBodyHasString("some=start%3Bval");
expect(foundString).toBe(true);
});
});
Expand Down

0 comments on commit c744d43

Please sign in to comment.