diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | lib/http_observer/process_response.js | 2 | ||||
| -rw-r--r-- | lib/http_observer/stream_loader.js | 2 | ||||
| -rw-r--r-- | lib/script_entries/crypto.js | 1 | ||||
| -rw-r--r-- | test/test-crypto-a.js | 9 |
5 files changed, 7 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index bac3aa5..906c727 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: python python: - "2.7" addons: - firefox: "38.0" + firefox: "38.0.5" before_script: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" diff --git a/lib/http_observer/process_response.js b/lib/http_observer/process_response.js index 000daa2..ae643ab 100644 --- a/lib/http_observer/process_response.js +++ b/lib/http_observer/process_response.js @@ -391,7 +391,7 @@ var processResponseObject = { ) { converter.charset = this.req.contentCharset; } else { - converter.charset = "utf-8"; + converter.charset = "UTF-8"; } var stream = converter.convertToInputStream(this.data); diff --git a/lib/http_observer/stream_loader.js b/lib/http_observer/stream_loader.js index 09b4a63..ec21cb7 100644 --- a/lib/http_observer/stream_loader.js +++ b/lib/http_observer/stream_loader.js @@ -148,7 +148,7 @@ StreamListener.prototype.onDetermineCharset = function onDetermineCharset( loader.channel.contentCharset = match[1]; return match[1]; } else { - return "utf-8"; + return "UTF-8"; } } }; diff --git a/lib/script_entries/crypto.js b/lib/script_entries/crypto.js index 5fb920f..d8d9c0a 100644 --- a/lib/script_entries/crypto.js +++ b/lib/script_entries/crypto.js @@ -34,7 +34,6 @@ CryptoString.prototype.init = function(hashAlgorithm, charset) { this.converter.charset = charset; this.hashAlgorithm = hashAlgorithm; this.cryptoHash.init(this.cryptoHash[this.hashAlgorithm]); - }; CryptoString.prototype.encryptString = function(str) { diff --git a/test/test-crypto-a.js b/test/test-crypto-a.js index 64e98c0..d895c16 100644 --- a/test/test-crypto-a.js +++ b/test/test-crypto-a.js @@ -20,17 +20,16 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ var crypto = require("script_entries/crypto"); -var longString = require("./mock/long_string.js").longString; -var Request = require("sdk/request").Request; -var cRequest = require("html_script_finder/dom_handler/request"); exports.testSha1EncryptTest = function(assert) { var str = "This is my test string"; - assert.equal(crypto.sha1Encrypt(str), 'e925bfd93e14174c2b2c83f68b3d3243df3005ef'); + assert.equal( + crypto.sha1Encrypt(str), + 'e925bfd93e14174c2b2c83f68b3d3243df3005ef'); }; exports.testSha1EncryptjQueryTest = function(assert, done) { - var request = Request({ + var request = require('sdk/request').Request({ 'url': 'https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js' }); request.on('complete', function(response) { |