MOBILE-3565 tests: Add some unit tests for URL utils

src/app/components/tests/icon.test.ts

@@ -26,9 +26,10 @@ describe('CoreIconComponent', () => {
         expect(fixture.nativeElement.innerHTML.trim()).not.toHaveLength(0);
 
         const icon = fixture.nativeElement.querySelector('ion-icon');
+        const name = icon.getAttribute('name') || icon.getAttribute('ng-reflect-name') || '';
+
         expect(icon).not.toBeNull();
-        expect(icon.classList.contains('fa')).toBe(true);
+        expect(name).toEqual('fa-thumbs-up');
-        expect(icon.classList.contains('fa-thumbs-up')).toBe(true);
         expect(icon.getAttribute('role')).toEqual('presentation');
     });
 

src/app/core/settings/pages/about/about.page.ts

@@ -16,7 +16,6 @@ import { CoreSites } from '@services/sites';
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import { CoreConstants } from '@core/constants';
-import { CoreApp } from '@services/app';
 
 @Component({
     selector: 'settings-about',

src/app/services/tests/utils/url.test.ts

@@ -0,0 +1,79 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { CoreUrlUtilsProvider } from '@services/utils/url';
+
+describe('CoreUrlUtilsProvider', () => {
+
+    let urlUtils: CoreUrlUtilsProvider;
+
+    beforeEach(() => {
+        urlUtils = new CoreUrlUtilsProvider();
+    });
+
+    it('adds www if missing', () => {
+        const originalUrl = 'https://moodle.org';
+        const url = urlUtils.addOrRemoveWWW(originalUrl);
+
+        expect(url).toEqual('https://www.moodle.org');
+    });
+
+    it('removes www if present', () => {
+        const originalUrl = 'https://www.moodle.org';
+        const url = urlUtils.addOrRemoveWWW(originalUrl);
+
+        expect(url).toEqual('https://moodle.org');
+    });
+
+    it('adds params to URL without params', () => {
+        const originalUrl = 'https://moodle.org';
+        const params = {
+            first: '1',
+            second: '2',
+        };
+        const url = urlUtils.addParamsToUrl(originalUrl, params);
+
+        expect(url).toEqual('https://moodle.org?first=1&second=2');
+    });
+
+    it('adds params to URL with existing params', () => {
+        const originalUrl = 'https://moodle.org?existing=1';
+        const params = {
+            first: '1',
+            second: '2',
+        };
+        const url = urlUtils.addParamsToUrl(originalUrl, params);
+
+        expect(url).toEqual('https://moodle.org?existing=1&first=1&second=2');
+    });
+
+    it('doesn\'t change URL if no params supplied', () => {
+        const originalUrl = 'https://moodle.org';
+        const url = urlUtils.addParamsToUrl(originalUrl);
+
+        expect(url).toEqual(originalUrl);
+    });
+
+    it('adds anchor to URL', () => {
+        const originalUrl = 'https://moodle.org';
+        const params = {
+            first: '1',
+            second: '2',
+        };
+        const url = urlUtils.addParamsToUrl(originalUrl, params, 'myanchor');
+
+        expect(url).toEqual('https://moodle.org?first=1&second=2#myanchor');
+    });
+
+});