From ad47649e9694ef144ba7c3a2740b3b42722f99ef Mon Sep 17 00:00:00 2001 From: James Lambie Date: Mon, 28 Aug 2017 18:25:18 +0100 Subject: [PATCH 1/3] test: add test suite --- .gitignore | 4 + index.js | 191 ++++++++------ license.md | 619 -------------------------------------------- package.json | 19 +- readme.md | 41 +-- scripts/coverage.js | 45 ++++ test/mocha.opts | 3 + test/queue.js | 465 +++++++++++++++++++++++++++++++++ 8 files changed, 649 insertions(+), 738 deletions(-) create mode 100644 .gitignore delete mode 100644 license.md create mode 100755 scripts/coverage.js create mode 100644 test/mocha.opts create mode 100644 test/queue.js diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..19d803d --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.DS_Store +coverage/* +scripts/*.svg +node_modules/ \ No newline at end of file diff --git a/index.js b/index.js index f434317..64fe7ad 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,5 @@ +'use strict' + const RSMQ = require('rsmq') /* @@ -6,98 +8,123 @@ const RSMQ = require('rsmq') * respects message signatures that should be deferred until * a later time (specified in config) */ -module.exports = function Queue (opts) { - // instantiate message queue - const rsmq = new RSMQ({ - host: opts.host, - port: opts.port - }) - +let QueueWrapper = function (options) { + this.options = options + + // initialise queue + this.rsmq = this.initialiseQueue() + // initialise connection state - var connected = null - rsmq.on('connect', () => connected = true) - rsmq.on('disconnect', () => connected = false) - - // do request, fail or wait - function request (req, err) { - if (connected === true) return req() - if (connected === false) return err() - - rsmq.on('connect', connect) - rsmq.on('disconnect', disconnect) - - function connect () { - req() - removeListeners() - } - - function disconnect () { - err() - removeListeners() - } - - function removeListeners () { - rsmq.removeListener('connect', connect) - rsmq.removeListener('disconnect', disconnect) + this.connected = null + + this.rsmq.on('connect', () => { + this.connected = true + }) + + this.rsmq.on('disconnect', () => { + this.connected = false + }) + + return this +} + +// instantiate message queue +QueueWrapper.prototype.initialiseQueue = function () { + return new RSMQ({ + host: this.options.host, + port: this.options.port + }) +} + +// public send function +QueueWrapper.prototype.send = function (message, done) { + const send = () => { + let options = { + qname: this.options.name, + message: message, + delay: this.getDelay(message) } + + this.rsmq.sendMessage(options, done) } - - // public send function - this.send = function (message, done) { - function send () { - var options = { - qname: opts.name, - message: message, - delay: getDelay(message) - } - rsmq.sendMessage(options, done) - } - function error () { - done(new Error('Queue server connection refused')) - } + function error () { + done(new Error('Queue server connection refused')) + } + + this.request(send, error) +} - request(send, error) +// do request, fail or wait +QueueWrapper.prototype.request = function (req, err) { + if (this.connected === true) { + return req() } - // determine message delay (or 0) - function getDelay (message) { - return isDeferred(message) - ? untilStart() / 1000 - : 0 + if (this.connected === false) { + return err() } - // is message signature in deferred list? - function isDeferred (message) { - if (!opts.deferred) return false - return opts.deferred.messages.some((value) => { - return message.startsWith(value) - }) + function connect () { + req() + removeListeners() } - - // how long until deferred message window? - function untilStart () { - var now = new Date() - var start = parseTime(opts.deferred.start) - var stop = parseTime(opts.deferred.stop) - - if (now >= start) { // in or later than window - if (now < stop || stop < start) return 0 // in window or rollover - return 24 * 60 * 60 * 1000 - (now - start) // later than window - } - if (now < start) { // in or before window - if (now < stop && stop < start) return 0 // in window or rollover - return start - now // earlier than window - } + + function disconnect () { + err() + removeListeners() } - - // parse time string from config file - function parseTime (string) { - var time = new Date() - var [hrs, mins] = string.split(':') - time.setUTCHours(hrs, mins) - return time + + function removeListeners () { + this.rsmq.removeListener('connect', connect) + this.rsmq.removeListener('disconnect', disconnect) } - - return this + + this.rsmq.on('connect', connect) + this.rsmq.on('disconnect', disconnect) +} + +// determine message delay (or 0) +QueueWrapper.prototype.getDelay = function (message) { + return this.isDeferred(message) + ? this.untilStart() / 1000 + : 0 +} + +// is message signature in deferred list? +QueueWrapper.prototype.isDeferred = function (message) { + if (!this.options.deferred) return false + + if (!Array.isArray(this.options.deferred.messages)) return false + + return this.options.deferred.messages.some((value) => { + return message.startsWith(value) + }) } + +// how long until deferred message window? +QueueWrapper.prototype.untilStart = function () { + const now = new Date() + const start = this.parseTime(this.options.deferred.start) + const stop = this.parseTime(this.options.deferred.stop) + + if (now >= start) { // in or later than window + if (now < stop || stop < start) return 0 // in window or rollover + return 24 * 60 * 60 * 1000 - (now - start) // later than window + } + + if (now < start) { // in or before window + if (now < stop && stop < start) return 0 // in window or rollover + return start - now // earlier than window + } +} + +// parse time string from config file +QueueWrapper.prototype.parseTime = function (string) { + const time = new Date() + const timeParts = string.split(':') + time.setUTCHours(timeParts[0], timeParts[1]) + return time +} + +module.exports = QueueWrapper diff --git a/license.md b/license.md deleted file mode 100644 index 829aae5..0000000 --- a/license.md +++ /dev/null @@ -1,619 +0,0 @@ -GNU AFFERO GENERAL PUBLIC LICENSE -================================= - -Version 3, 19 November 2007 - -Copyright (C) 2007 Free Software Foundation, Inc. -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -## Preamble - -The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - -The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - -Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - -A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - -The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - -An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - -The precise terms and conditions for copying, distribution and -modification follow. - -## TERMS AND CONDITIONS - -### 0. Definitions. - -"This License" refers to version 3 of the GNU Affero General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based -on the Program. - -To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - -### 1. Source Code. - -The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - -A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - -The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - -The Corresponding Source for a work in source code form is that -same work. - -### 2. Basic Permissions. - -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - -### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - -### 4. Conveying Verbatim Copies. - -You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - -### 5. Conveying Modified Source Versions. - -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - -a) The work must carry prominent notices stating that you modified -it, and giving a relevant date. - -b) The work must carry prominent notices stating that it is -released under this License and any conditions added under section -7. This requirement modifies the requirement in section 4 to -"keep intact all notices". - -c) You must license the entire work, as a whole, under this -License to anyone who comes into possession of a copy. This -License will therefore apply, along with any applicable section 7 -additional terms, to the whole of the work, and all its parts, -regardless of how they are packaged. This License gives no -permission to license the work in any other way, but it does not -invalidate such permission if you have separately received it. - -d) If the work has interactive user interfaces, each must display -Appropriate Legal Notices; however, if the Program has interactive -interfaces that do not display Appropriate Legal Notices, your -work need not make them do so. - -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - -### 6. Conveying Non-Source Forms. - -You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - -a) Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by the -Corresponding Source fixed on a durable physical medium -customarily used for software interchange. - -b) Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by a -written offer, valid for at least three years and valid for as -long as you offer spare parts or customer support for that product -model, to give anyone who possesses the object code either (1) a -copy of the Corresponding Source for all the software in the -product that is covered by this License, on a durable physical -medium customarily used for software interchange, for a price no -more than your reasonable cost of physically performing this -conveying of source, or (2) access to copy the -Corresponding Source from a network server at no charge. - -c) Convey individual copies of the object code with a copy of the -written offer to provide the Corresponding Source. This -alternative is allowed only occasionally and noncommercially, and -only if you received the object code with such an offer, in accord -with subsection 6b. - -d) Convey the object code by offering access from a designated -place (gratis or for a charge), and offer equivalent access to the -Corresponding Source in the same way through the same place at no -further charge. You need not require recipients to copy the -Corresponding Source along with the object code. If the place to -copy the object code is a network server, the Corresponding Source -may be on a different server (operated by you or a third party) -that supports equivalent copying facilities, provided you maintain -clear directions next to the object code saying where to find the -Corresponding Source. Regardless of what server hosts the -Corresponding Source, you remain obligated to ensure that it is -available for as long as needed to satisfy these requirements. - -e) Convey the object code using peer-to-peer transmission, provided -you inform other peers where the object code and Corresponding -Source of the work are being offered to the general public at no -charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - -The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - -### 7. Additional Terms. - -"Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the -terms of sections 15 and 16 of this License; or - -b) Requiring preservation of specified reasonable legal notices or -author attributions in that material or in the Appropriate Legal -Notices displayed by works containing it; or - -c) Prohibiting misrepresentation of the origin of that material, or -requiring that modified versions of such material be marked in -reasonable ways as different from the original version; or - -d) Limiting the use for publicity purposes of names of licensors or -authors of the material; or - -e) Declining to grant rights under trademark law for use of some -trade names, trademarks, or service marks; or - -f) Requiring indemnification of licensors and authors of that -material by anyone who conveys the material (or modified versions of -it) with contractual assumptions of liability to the recipient, for -any liability that these contractual assumptions directly impose on -those licensors and authors. - -All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - -### 8. Termination. - -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - -However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - -### 9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - -### 10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - -An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - -### 11. Patents. - -A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - -A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - -If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - -A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - -### 12. No Surrender of Others' Freedom. - -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - -### 13. Remote Network Interaction; Use with the GNU General Public License. - -Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - -Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - -### 14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - -Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - -### 15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -### 16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - -### 17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. diff --git a/package.json b/package.json index 096936e..36bbbc1 100644 --- a/package.json +++ b/package.json @@ -6,13 +6,28 @@ "dependencies": { "rsmq": "^0.7.1" }, + "devDependencies": { + "fakeredis": "^1.0.3", + "istanbul": "^0.4.0", + "istanbul-cobertura-badger": "^1.2.1", + "mocha": "^3.2.0", + "redis": "^2.6.4", + "should": "^11.1.2", + "sinon": "2.x.x", + "snazzy": "^5.0.0", + "standard": "^8.6.0", + "supertest": "^2.0.1", + "semantic-release": "^6.3.2" + }, "scripts": { - "test": "node_modules/.bin/mocha", + "test": "snazzy index.js && ./node_modules/.bin/istanbul cover --report cobertura --report text --report html --report lcov ./node_modules/mocha/bin/_mocha", + "posttest": "./scripts/coverage.js", "start": "node ./main.js --node-env=development" }, "repository": { "type": "git", "url": "git://github.com/dadi/queue-wrapper.git" }, - "author": "Robert Stanford " + "author": "Robert Stanford ", + "license": "MIT" } diff --git a/readme.md b/readme.md index 0dc891e..fc6f1de 100644 --- a/readme.md +++ b/readme.md @@ -2,6 +2,12 @@ A high-level library for interacting with [DADI Queue](https://github.com/dadi/queue) +[![npm (scoped)](https://img.shields.io/npm/v/@dadi/queue-wrapper.svg?maxAge=10800&style=flat-square)](https://www.npmjs.com/package/@dadi/queue-wrapper) +[![coverage](https://img.shields.io/badge/coverage-68%25-yellow.svg?style=flat?style=flat-square)](https://github.com/dadi/queue-wrapper) +[![Build Status](https://travis-ci.org/dadi/queue-wrapper.svg?branch=master)](https://travis-ci.org/dadi/queue-wrapper) +[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](http://standardjs.com/) +[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)](https://github.com/semantic-release/semantic-release) + ## Overview DADI Queue is a lightweight, high-performance task queue. @@ -47,38 +53,3 @@ var queue = Queue({ ``` The options above will ensure that the queue will only begin processing messages starting with 'foo' and 'bar:baz' between 20:00 and 02:00 every day. - -## License - -DADI is a data centric development and delivery stack, built specifically in support of the principles of API first and COPE. - -Copyright notice -(C) 2016 DADI+ Limited -All rights reserved - -This product is part of DADI.
-DADI is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version ("the AGPL"). - -**If you wish to use DADI outside the scope of the AGPL, please -contact us at info@dadi.co for details of alternative licence -arrangements.** - -**This product may be distributed alongside other components -available under different licences (which may not be AGPL). See -those components themselves, or the documentation accompanying -them, to determine what licences are applicable.** - -DADI is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -The GNU Affero General Public License (AGPL) is available at -http://www.gnu.org/licenses/agpl-3.0.en.html.
-A copy can be found in the file license.md distributed with -these files. - -This copyright notice MUST APPEAR in all copies of the product! diff --git a/scripts/coverage.js b/scripts/coverage.js new file mode 100755 index 0000000..d4d6217 --- /dev/null +++ b/scripts/coverage.js @@ -0,0 +1,45 @@ +#! /usr/bin/env node + +var fs = require('fs') +var path = require('path') + +var coberturaBadger = require('istanbul-cobertura-badger') + +var opts = { + badgeFileName: 'coverage', + destinationDir: __dirname, + istanbulReportFile: path.resolve(__dirname + '/../coverage', 'cobertura-coverage.xml'), + thresholds: { + excellent: 90, // overall percent >= excellent, green badge + good: 60 // overall percent < excellent and >= good, yellow badge + // overall percent < good, red badge + } +} + +// console.log(opts) + +// Load the badge for the report$ +coberturaBadger(opts, function parsingResults (err, badgeStatus) { + if (err) { + console.log('An error occurred: ' + err.message) + return + } + + // console.log(badgeStatus) + + var readme = path.resolve(__dirname + '/../readme.md') + var badgeUrl = badgeStatus.url; // e.g. http://img.shields.io/badge/coverage-60%-yellow.svg + + // open the README.md and add this url + fs.readFile(readme, {encoding: 'utf-8'}, function (err, body) { + body = body.replace(/(!\[coverage\]\()(.+?)\?*(\))/g, function (whole, a, b, c) { + return a + badgeUrl.replace('%','%25') + '?style=flat-square' + c + }) + + fs.writeFile(readme, body, {encoding: 'utf-8'}, function (err) { + if (err) console.log(err.toString()) + + console.log('Coverage badge successfully added to ' + readme) + }) + }) +}) diff --git a/test/mocha.opts b/test/mocha.opts new file mode 100644 index 0000000..2d026c6 --- /dev/null +++ b/test/mocha.opts @@ -0,0 +1,3 @@ +--growl +--ui bdd +--recursive diff --git a/test/queue.js b/test/queue.js new file mode 100644 index 0000000..59e0981 --- /dev/null +++ b/test/queue.js @@ -0,0 +1,465 @@ +'use strict' + +var path = require('path') +var should = require('should') +var sinon = require('sinon') +var util = require('util') +var EventEmitter = require('events') + +const QueueWrapper = require(path.join(__dirname, '../index')) + +var FakeRsmq = function() { + this.sendMessage = function(options, callback) { + callback(options) + } + + this.removeListener = function(state, fn) { + + } + + this.del = function() { + + } + + this.start = function() { + + } + + this.stop = function() { + + } +} + +let fakeRsmq +let queueWrapper + +util.inherits(FakeRsmq, EventEmitter) + +describe('QueueWrapper', function (done) { + beforeEach(function (done) { + fakeRsmq = new FakeRsmq() + sinon.stub(QueueWrapper.prototype, 'initialiseQueue').returns(fakeRsmq) + + done() + }) + + afterEach(function (done) { + QueueWrapper.prototype.initialiseQueue.restore() + done() + }) + + describe('Connect', function () { + it ('should set connected state when connect is emitted', function (done) { + queueWrapper = new QueueWrapper({ + name: 'myqueue' + }) + + fakeRsmq.emit('connect', () => { + + }) + + queueWrapper.connected.should.eql(true) + done() + }) + + it ('should set connected state when disconnect is emitted', function (done) { + queueWrapper = new QueueWrapper({ + name: 'myqueue' + }) + + fakeRsmq.emit('connect', () => { + + }) + + queueWrapper.connected.should.eql(true) + + fakeRsmq.emit('disconnect', () => { + + }) + + queueWrapper.connected.should.eql(false) + + done() + }) + }) + + describe('Send', function () { + it ('should prepare options and send message when connected', function (done) { + queueWrapper = new QueueWrapper({ + name: 'myqueue' + }) + + fakeRsmq.emit('connect', () => { + + }) + + // send is faked above, so the response should contain the options + // created by the queueWrapper to be sent as the message to the real queue + queueWrapper.send('message', (response) => { + should.exist(response.qname) + done() + }) + }) + + it ('should return error when not connected', function (done) { + queueWrapper = new QueueWrapper({ + name: 'myqueue' + }) + + fakeRsmq.emit('connect', () => { + + }) + + queueWrapper.connected = false + + // the response should contain an error + queueWrapper.send('message', (response) => { + should.exist(response.name) + response.name.should.eql('Error') + done() + }) + }) + }) + + describe('Deferred', function () { + it ('should return 0 if no message types are deferred', function (done) { + queueWrapper = new QueueWrapper({}) + + queueWrapper.getDelay('message').should.eql(0) + done() + }) + + it ('should return 0 if message options is not array', function (done) { + queueWrapper = new QueueWrapper({ + deferred: { + + } + }) + + queueWrapper.getDelay('xxx').should.eql(0) + done() + }) + + it ('should return 0 if message type is not deferred', function (done) { + queueWrapper = new QueueWrapper({ + deferred: { + messages: ['message'] + } + }) + + queueWrapper.getDelay('xxx').should.eql(0) + done() + }) + + it ('should return > 0 if message type is deferred', function (done) { + queueWrapper = new QueueWrapper({ + deferred: { + messages: ['message'], + start: '02:00', + stop: '04:00', + } + }) + + queueWrapper.getDelay('message').should.be.above(0) + done() + }) + }) +}) + + // describe.skip('Worker', function () { + // it('should receive additional data passed in the message request', function (done) { + // queueHandler = new QueueHandler() + // + // var msg = { + // message: 'sms:send-reminder:123456', + // address: 'hello', + // sent: Date.now(), + // rc: 1 + // } + // + // var spy = sinon.spy(Router.prototype, 'getWorkerData') + // + // fakeRsmq.emit('data', msg) + // + // spy.restore() + // spy.called.should.eql(true) + // var returnValue = spy.firstCall.returnValue + // returnValue.should.eql('123456') + // done() + // }) + // }) + // + // describe.skip('Queue', function () { + // it('should be started by throttle', function(done) { + // var msg = { + // message: 'XXX', + // address: 'hello', + // sent: Date.now(), + // rc: 1 + // } + // + // var queueHandler = new QueueHandler() + // + // var handlerStub = sinon.stub(QueueHandler.prototype, 'handle', function (err, req, done) { + // if (typeof done === 'function') { + // req.address = 'hello' + // done() + // } + // }) + // + // var spy = sinon.spy(fakeRsmq, 'start') + // + // // change the message count in the throttle + // queueHandler.queue.throttle.val = 5 + // + // fakeRsmq.emit('data', msg) + // + // spy.restore() + // handlerStub.restore() + // + // spy.calledOnce.should.eql(true) + // done() + // }) + // + // it('should be stopped by throttle', function(done) { + // var msg = { + // message: 'XXX', + // address: 'hello', + // sent: Date.now(), + // rc: 1 + // } + // + // var queueHandler = new QueueHandler() + // + // var handlerStub = sinon.stub(QueueHandler.prototype, 'handle', function (err, req, done) { + // if (typeof done === 'function') { + // req.address = 'hello' + // done() + // } + // }) + // + // var spy = sinon.spy(fakeRsmq, 'stop') + // + // // change the message count in the throttle + // queueHandler.queue.throttle.val = 5 + // + // fakeRsmq.emit('message', msg, function() { + // + // }) + // + // spy.restore() + // handlerStub.restore() + // + // spy.calledOnce.should.eql(true) + // done() + // }) + // + // it('should handle error events, passing the error to the QueueHandler', function(done) { + // var msg = { + // message: 'XXX' + // } + // + // var queueHandler = new QueueHandler() + // var spy = sinon.spy(QueueHandler.prototype, 'handle') + // + // fakeRsmq.emit('error', 'ERROR', msg) + // + // spy.restore() + // + // spy.calledOnce.should.eql(true) + // var arg = spy.firstCall.args[0] + // arg.name.should.eql('BrokerError') + // arg.error.should.eql('ERROR') + // + // done() + // }) + // + // it('should handle data events, passing the message to the QueueHandler', function(done) { + // var msg = { + // message: 'XXX', + // address: 'hello', + // sent: Date.now(), + // rc: 1 + // } + // + // var queueHandler = new QueueHandler() + // var spy = sinon.spy(QueueHandler.prototype, 'handle') + // + // fakeRsmq.emit('data', msg) + // + // spy.restore() + // + // spy.called.should.eql(true) + // var args = spy.firstCall.args + // should.not.exist(args[0]) + // done() + // }) + // + // it('should delete a message if it is processed successfully', function(done) { + // var msg = { + // id: 'hello', + // message: 'XXX', + // address: 'hello', + // sent: Date.now(), + // rc: 1 + // } + // + // var queueHandler = new QueueHandler() + // + // var handlerStub = sinon.stub(QueueHandler.prototype, 'handle', function (err, req, done) { + // if (typeof done === 'function') { + // req.address = 'hello' + // done() + // } + // }) + // + // var spy = sinon.spy(fakeRsmq, 'del') + // + // fakeRsmq.emit('data', msg) + // + // spy.restore() + // handlerStub.restore() + // + // spy.called.should.eql(true) + // var args = spy.firstCall.args + // args[0].should.eql(msg.id) + // done() + // }) + // }) + + // describe.skip('processResponse', function () { + // it('should create a WorkerError when an error is returned by the QueueHandler', function (done) { + // queueHandler = new QueueHandler() + // + // var handlerStub = sinon.stub(QueueHandler.prototype, 'handle', function (err, req, done) { + // if (typeof done === 'function') { + // req.address = 'hello' + // done('ERROR') + // } + // }) + // + // var msg = { + // message: 'XXX', + // address: 'hello', + // sent: Date.now(), + // rc: 1 + // } + // + // fakeRsmq.emit('data', msg) + // + // handlerStub.restore() + // handlerStub.calledTwice.should.eql(true) + // var arg = handlerStub.secondCall.args[0] + // arg.name.should.eql('WorkerError') + // arg.error.should.eql('ERROR') + // done() + // }) + // + // it('should create an ExceededError when an error is returned by the QueueHandler and there are no retries left', function (done) { + // queueHandler = new QueueHandler() + // + // var handlerStub = sinon.stub(QueueHandler.prototype, 'handle', function (err, req, done) { + // if (typeof done === 'function') { + // req.address = 'hello' + // delete req.retries + // done('ERROR') + // } + // }) + // + // var msg = { + // message: 'XXX', + // address: 'hello', + // sent: Date.now(), + // rc: 1 + // } + // + // fakeRsmq.emit('data', msg) + // + // handlerStub.restore() + // handlerStub.calledTwice.should.eql(true) + // var arg = handlerStub.secondCall.args[0] + // arg.name.should.eql('ExceededError') + // done() + // }) + // + // it('should create an InvalidError when an returned message has no address', function (done) { + // queueHandler = new QueueHandler() + // + // var handlerStub = sinon.stub(QueueHandler.prototype, 'handle', function (err, req, done) { + // if (typeof done === 'function') { + // req.address = [] + // done('ERROR') + // } + // }) + // + // var msg = { + // message: 'XXX', + // address: 'hello', + // sent: Date.now(), + // rc: 1 + // } + // + // fakeRsmq.emit('data', msg) + // + // handlerStub.restore() + // handlerStub.calledTwice.should.eql(true) + // //console.log(handlerStub.secondCall.args) + // var arg = handlerStub.secondCall.args[0] + // arg.name.should.eql('InvalidError') + // done() + // }) + // + // it('should create a TimeoutError when a message timeout has passed', function (done) { + // queueHandler = new QueueHandler() + // + // var handlerStub = sinon.stub(QueueHandler.prototype, 'handle', function (err, req, done) { + // if (typeof done === 'function') { + // req.address = 'hello' + // req.timeout = 1000 + // done('ERROR') + // } + // }) + // + // var msg = { + // message: 'XXX', + // address: 'hello', + // sent: Date.now(), + // rc: 1 + // } + // + // fakeRsmq.emit('data', msg) + // + // handlerStub.restore() + // handlerStub.calledTwice.should.eql(true) + // var arg = handlerStub.secondCall.args[0] + // arg.name.should.eql('TimeoutError') + // done() + // }) + // + // it('should return true if no error', function (done) { + // queueHandler = new QueueHandler() + // + // var handlerStub = sinon.stub(QueueHandler.prototype, 'handle', function (err, req, done) { + // if (typeof done === 'function') { + // req.address = 'hello' + // done() + // } + // }) + // + // var msg = { + // message: 'XXX', + // address: 'hello', + // sent: Date.now(), + // rc: 1 + // } + // + // var spy = sinon.spy(Broker.prototype, 'processResponse') + // + // fakeRsmq.emit('data', msg) + // + // spy.restore() + // spy.calledOnce.should.eql(true) + // spy.firstCall.returnValue.should.eql(true) + // done() + // }) + // }) From e284f7c33528ea89c5b48c0dc9793d74c1d34534 Mon Sep 17 00:00:00 2001 From: James Lambie Date: Mon, 28 Aug 2017 18:27:42 +0100 Subject: [PATCH 2/3] chore: add CI build --- .travis.yml | 19 +++++++++++++++++++ package.json | 9 +++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..305cca9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,19 @@ +language: node_js +cache: + directories: + - node_modules +notifications: + slack: dadi:pnhiL60xOrm7GOglHUmb7xHK + email: false +node_js: + - '7' + - '6' +before_script: + - npm prune +after_success: + - npm run semantic-release +branches: + except: + - /^v\d+\.\d+\.\d+$/ +services: + - redis-server diff --git a/package.json b/package.json index 36bbbc1..58a5019 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dadi/queue-wrapper", - "version": "1.0.0", + "version": "0.0.0-development", "description": "A high-level library for interacting with DADI Queue.", "main": "index.js", "dependencies": { @@ -17,16 +17,17 @@ "snazzy": "^5.0.0", "standard": "^8.6.0", "supertest": "^2.0.1", - "semantic-release": "^6.3.2" + "semantic-release": "^7.0.2" }, "scripts": { "test": "snazzy index.js && ./node_modules/.bin/istanbul cover --report cobertura --report text --report html --report lcov ./node_modules/mocha/bin/_mocha", "posttest": "./scripts/coverage.js", - "start": "node ./main.js --node-env=development" + "start": "node ./main.js --node-env=development", + "semantic-release": "semantic-release pre && npm publish && semantic-release post" }, "repository": { "type": "git", - "url": "git://github.com/dadi/queue-wrapper.git" + "url": "https://github.com/dadi/queue-wrapper.git" }, "author": "Robert Stanford ", "license": "MIT" From 5b73eef8d4744425cb3570f9dc4909b1760c7095 Mon Sep 17 00:00:00 2001 From: James Lambie Date: Mon, 28 Aug 2017 20:16:27 +0100 Subject: [PATCH 3/3] fix: modify require setup --- index.js | 12 +++++++----- test/queue.js | 5 ++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/index.js b/index.js index 64fe7ad..0bd06c3 100644 --- a/index.js +++ b/index.js @@ -24,8 +24,6 @@ let QueueWrapper = function (options) { this.rsmq.on('disconnect', () => { this.connected = false }) - - return this } // instantiate message queue @@ -45,6 +43,8 @@ QueueWrapper.prototype.send = function (message, done) { delay: this.getDelay(message) } + console.log(options) + this.rsmq.sendMessage(options, done) } @@ -57,6 +57,8 @@ QueueWrapper.prototype.send = function (message, done) { // do request, fail or wait QueueWrapper.prototype.request = function (req, err) { + let rsmq = this.rsmq + if (this.connected === true) { return req() } @@ -76,8 +78,8 @@ QueueWrapper.prototype.request = function (req, err) { } function removeListeners () { - this.rsmq.removeListener('connect', connect) - this.rsmq.removeListener('disconnect', disconnect) + rsmq.removeListener('connect', connect) + rsmq.removeListener('disconnect', disconnect) } this.rsmq.on('connect', connect) @@ -119,7 +121,7 @@ QueueWrapper.prototype.untilStart = function () { } } -// parse time string from config file +// parse time string from configured options QueueWrapper.prototype.parseTime = function (string) { const time = new Date() const timeParts = string.split(':') diff --git a/test/queue.js b/test/queue.js index 59e0981..44464e7 100644 --- a/test/queue.js +++ b/test/queue.js @@ -36,14 +36,13 @@ let queueWrapper util.inherits(FakeRsmq, EventEmitter) describe('QueueWrapper', function (done) { - beforeEach(function (done) { + beforeEach(function(done) { fakeRsmq = new FakeRsmq() sinon.stub(QueueWrapper.prototype, 'initialiseQueue').returns(fakeRsmq) - done() }) - afterEach(function (done) { + afterEach(function(done) { QueueWrapper.prototype.initialiseQueue.restore() done() })