diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-09-09 16:31:03 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-09-09 16:31:03 +0200 |
| commit | a84b978221e017399b515280a3f758e8f99eaf93 (patch) | |
| tree | 03e82227fb24ddb719ef499f85ac62df6e27dc70 | |
| parent | 2824b43b7332e847810f042c4183ce95ee90e852 (diff) | |
fix unit tests for phantomjs runner
| -rw-r--r-- | js/app/controllers/settingscontroller.coffee | 2 | ||||
| -rw-r--r-- | js/public/app.js | 2 | ||||
| -rw-r--r-- | js/tests/controllers/settingscontrollerSpec.coffee | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee index eaff0a274..b7cea8d21 100644 --- a/js/app/controllers/settingscontroller.coffee +++ b/js/app/controllers/settingscontroller.coffee @@ -34,7 +34,6 @@ angular.module('News').controller 'SettingsController', try FolderBusinessLayer.import(fileContent) catch error - console.error error $scope.error = true @@ -46,7 +45,6 @@ angular.module('News').controller 'SettingsController', parsedJSON = JSON.parse(fileContent) FeedBusinessLayer.importGoogleReader(parsedJSON) catch error - console.error error $scope.jsonError = true ]
\ No newline at end of file diff --git a/js/public/app.js b/js/public/app.js index 79c08094c..7f0b6c8f4 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -793,7 +793,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. return FolderBusinessLayer["import"](fileContent); } catch (_error) { error = _error; - console.error(error); return $scope.error = true; } }; @@ -806,7 +805,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. return FeedBusinessLayer.importGoogleReader(parsedJSON); } catch (_error) { error = _error; - console.error(error); return $scope.jsonError = true; } }; diff --git a/js/tests/controllers/settingscontrollerSpec.coffee b/js/tests/controllers/settingscontrollerSpec.coffee index 39bc53371..8603e75e9 100644 --- a/js/tests/controllers/settingscontrollerSpec.coffee +++ b/js/tests/controllers/settingscontrollerSpec.coffee @@ -35,6 +35,8 @@ describe 'SettingsController', -> @scope = {} @replace = '$scope': @scope + 'FolderBusinessLayer': + import: jasmine.createSpy('import') @controller = $controller('SettingsController', @replace) @@ -44,9 +46,12 @@ describe 'SettingsController', -> it 'should show an error if the xml import failed', => xml = 'test' + @replace.FolderBusinessLayer.import.andCallFake -> + throw new Error() @scope.import(xml) + expect(@replace.FolderBusinessLayer.import).toHaveBeenCalledWith(xml); expect(@scope.error).toBe(true) |