mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3060 from nextcloud/cleanup-js-tests 

Cleanup js tests
This commit is contained in:
Joas Schilling 2017-01-13 14:47:06 +01:00 committed by GitHub
parent 91beb178a7 dd88e70dff
commit 0f792fedef
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/js/tests/specs/coreSpec.js
View File

@ -967,8 +967,9 @@ describe('Core base tests', function() {
fadeOutStub.restore();
});
it('hides the first notification when calling hide without arguments', function() {
var $row1 = OC.Notification.show('One');
OC.Notification.show('One');
var $row2 = OC.Notification.show('Two');
spyOn(console, 'warn');
var $el = $('#notification');
var $rows = $el.find('.row');
@ -976,6 +977,7 @@ describe('Core base tests', function() {
OC.Notification.hide();
expect(console.warn).toHaveBeenCalled();
$rows = $el.find('.row');
expect($rows.length).toEqual(1);
expect($rows.eq(0).is($row2)).toEqual(true);

7
core/js/tests/specs/l10nSpec.js
View File

@ -21,6 +21,7 @@ describe('OC.L10N tests', function() {
describe('text translation', function() {
beforeEach(function() {
spyOn(console, 'warn');
OC.L10N.register(TEST_APP, {
'Hello world!': 'Hallo Welt!',
'Hello {name}, the weather is {weather}': 'Hallo {name}, das Wetter ist {weather}',
@ -78,8 +79,10 @@ describe('OC.L10N tests', function() {
}
it('generates plural for default text when translation does not exist', function() {
spyOn(console, 'warn');
OC.L10N.register(TEST_APP, {
});
expect(console.warn).toHaveBeenCalled();
expect(
n(TEST_APP, 'download %n file', 'download %n files', 0)
).toEqual('download 0 files');
@ -94,10 +97,12 @@ describe('OC.L10N tests', function() {
).toEqual('download 1024 files');
});
it('generates plural with default function when no forms specified', function() {
spyOn(console, 'warn');
OC.L10N.register(TEST_APP, {
'_download %n file_::_download %n files_':
['%n Datei herunterladen', '%n Dateien herunterladen']
});
expect(console.warn).toHaveBeenCalled();
checkPlurals();
});
it('generates plural with generated function when forms is specified', function() {
@ -150,9 +155,11 @@ describe('OC.L10N tests', function() {
it('calls callback if translation already available', function() {
var promiseStub = sinon.stub();
var callbackStub = sinon.stub();
spyOn(console, 'warn');
OC.L10N.register(TEST_APP, {
'Hello world!': 'Hallo Welt!'
});
expect(console.warn).toHaveBeenCalled();
OC.L10N.load(TEST_APP, callbackStub).then(promiseStub);
expect(callbackStub.calledOnce).toEqual(true);
expect(promiseStub.calledOnce).toEqual(true);

9
tests/karma.config.js
View File

@ -220,11 +220,15 @@ module.exports = function(config) {
// serve images to avoid warnings
files.push({pattern: 'core/img/**/*', watched: false, included: false, served: true});
files.push({pattern: 'core/css/images/*', watched: false, included: false, served: true});
// include core CSS
files.push({pattern: 'core/css/*.css', watched: true, included: true, served: true});
files.push({pattern: 'tests/css/*.css', watched: true, included: true, served: true});
// Allow fonts
files.push({pattern: 'core/fonts/*', watched: false, included: false, served: true});
config.set({
// base path, that will be used to resolve files and exclude
@ -245,8 +249,9 @@ module.exports = function(config) {
// prevent warnings for images
'/base/tests/img/': 'http://localhost:9876/base/core/img/',
'/base/tests/css/': 'http://localhost:9876/base/core/css/',
'/base/core/css/images/': 'http://localhost:9876/base/core/css/images/',
'/actions/': 'http://localhost:9876/base/core/img/actions/',
'/context.html//core/fonts/': 'http://localhost:9876/base/core/fonts/'
'/base/core/fonts/': 'http://localhost:9876/base/core/fonts/'
},
// test results reporter to use
@ -267,7 +272,7 @@ module.exports = function(config) {
reporters: [
{ type: 'html' },
{ type: 'cobertura' },
{ type: 'lcovonly' },
{ type: 'lcovonly' }
]
},