From c480a86ac04d5562352e1ee7acb59abdad70efb0 Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Mon, 26 Mar 2018 09:23:01 +0530 Subject: [PATCH] Fixed Codacy --- frappe/public/js/frappe/form/layout.js | 2 +- frappe/public/js/frappe/socketio_client.js | 2 +- frappe/public/js/frappe/ui/dialog.js | 2 +- frappe/public/js/frappe/ui/field_group.js | 2 +- .../website_settings/test_website_settings.js | 23 ------------------- .../website_settings/test_website_settings.py | 10 -------- socketio.js | 2 +- 7 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 frappe/website/doctype/website_settings/test_website_settings.js delete mode 100644 frappe/website/doctype/website_settings/test_website_settings.py diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 7cf60fdb48..f0bee7fecb 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -1,4 +1,4 @@ -import '../class' +import '../class'; frappe.provide("frappe.ui.form"); frappe.ui.form.Layout = Class.extend({ diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js index d309aae5c3..2f5067ab56 100644 --- a/frappe/public/js/frappe/socketio_client.js +++ b/frappe/public/js/frappe/socketio_client.js @@ -100,7 +100,7 @@ frappe.socketio = { var host = window.location.origin; if(window.dev_server) { var parts = host.split(":"); - var port = frappe.boot.socketio_port || port.toString() || '3000'; + port = frappe.boot.socketio_port || port.toString() || '3000'; if(parts.length > 2) { host = parts[0] + ":" + parts[1]; } diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index e3fee0c800..4daa49737a 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -1,4 +1,4 @@ -import './field_group' +import './field_group'; frappe.provide('frappe.ui'); diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js index eaeca34f25..0281f8596b 100644 --- a/frappe/public/js/frappe/ui/field_group.js +++ b/frappe/public/js/frappe/ui/field_group.js @@ -1,4 +1,4 @@ -import '../form/layout' +import '../form/layout'; frappe.provide('frappe.ui'); diff --git a/frappe/website/doctype/website_settings/test_website_settings.js b/frappe/website/doctype/website_settings/test_website_settings.js deleted file mode 100644 index c46c3599ac..0000000000 --- a/frappe/website/doctype/website_settings/test_website_settings.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Website Settings", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Website Settings - () => frappe.tests.make('Website Settings', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/frappe/website/doctype/website_settings/test_website_settings.py b/frappe/website/doctype/website_settings/test_website_settings.py deleted file mode 100644 index 44b584373f..0000000000 --- a/frappe/website/doctype/website_settings/test_website_settings.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -import frappe -import unittest - -class TestWebsiteSettings(unittest.TestCase): - pass diff --git a/socketio.js b/socketio.js index 204146221a..3bbbcdff71 100644 --- a/socketio.js +++ b/socketio.js @@ -212,7 +212,7 @@ io.on('connection', function (socket) { }); subscriber.on("message", function (channel, message, room) { - message = JSON.parse(message) + message = JSON.parse(message); console.log("Dispatching to Room: " + message.room + " event " + message.event + " with message " + JSON.stringify(message.message)); io.to(message.room).emit(message.event, message.message) });