#234 | Better URL validation | Iframe board tests added (plus some refactor) #242
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
January 24, 2020 13:19
szymon-owczarzak
added
the
maintenance
szymon-owczarzak
changed the title
| @@ -31,7 +31,7 @@ | |||
| <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> | |||
| <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> | |||
|
|
|||
| - [ ] My code follows the [code style](/CONTRIBUTING.md#coding-conventions) of this project. | |||
| - [ ] My code follows the [code style](https://github.com/Cognifide/cogboard/blob/master/CONTRIBUTING.md#coding-conventions) of this project. | |||
There was a problem hiding this comment.
This link did not worked
szymon-owczarzak
changed the title
…ed' into cypress-tests-more-object-oriented
added 2 commits
January 24, 2020 14:53
Comment on lines
+8
to
+17
| fun create( | ||
| address: String, | ||
| vertx: Vertx, | ||
| configuration: Map<String, (JsonObject) -> String> | ||
| ): MessageConsumer<JsonObject> = vertx.eventBus() | ||
| .consumer<JsonObject>(address) | ||
| .handler { | ||
| val body = it.body() | ||
| configuration[body.getString("method")]?.let { method -> | ||
| it.reply(method(body.getJsonObject("payload"))) |
There was a problem hiding this comment.
Detekt fix
Comment on lines
+15
to
+25
| return if (this.isEmpty()) { | ||
| -1 | ||
| } else { | ||
| Random.nextInt(0, this.size) | ||
| val indexes = this.mapIndexed { index, _ -> index } | ||
| .filter { i -> !usedIndexes.contains(i) } | ||
| when { | ||
| // If there is one index, there is no need to use random function | ||
| indexes.size == 1 -> return indexes[0] | ||
| indexes.isNotEmpty() -> indexes[Random.nextInt(0, indexes.size)] | ||
| else -> Random.nextInt(0, this.size) | ||
| } |
There was a problem hiding this comment.
Detekt fix
Comment on lines
+63
to
+66
| .filter { | ||
| it.getString(version.getMetricKey()) != "alert_status" && | ||
| it.getString(version.getMetricKey()) == metricName | ||
| } |
There was a problem hiding this comment.
Detekt fix
Comment on lines
+18
to
+20
| fun getVersion(version: String) = | ||
| if (version == "5.x") V5x() | ||
| else V7x() |
There was a problem hiding this comment.
Detekt fix
Comment on lines
+79
to
+83
| validator: () => | ||
| string().matches( | ||
| /^(?:([A-Za-z]+):)?(\/{0,3})([0-9.\-A-Za-z]+)(?::(\d+))?(?:\/([^?#]*))?(?:\?([^#]*))?(?:#(.*))?$/, | ||
| { message: vm.INVALID_URL(), excludeEmptyString: true } | ||
| ) |
There was a problem hiding this comment.
Better URL Validation - port number possible
Comment on lines
+217
to
+221
| validator: () => | ||
| string().matches( | ||
| /^(?:([A-Za-z]+):)?(\/{0,3})([0-9.\-A-Za-z]+)(?::(\d+))?(?:\/([^?#]*))?(?:\?([^#]*))?(?:#(.*))?$/, | ||
| { message: vm.INVALID_URL(), excludeEmptyString: true } | ||
| ) |
There was a problem hiding this comment.
Better URL Validation - port number possible
Comment on lines
+227
to
+231
| validator: () => | ||
| string().matches( | ||
| /^(?:([A-Za-z]+):)?(\/{0,3})([0-9.\-A-Za-z]+)(?::(\d+))?(?:\/([^?#]*))?(?:\?([^#]*))?(?:#(.*))?$/, | ||
| { message: vm.INVALID_URL(), excludeEmptyString: true } | ||
| ) |
There was a problem hiding this comment.
Better URL Validation - port number possible
Comment on lines
+25
to
+33
| it('Logged user can add new iframe dashboard', () => { | ||
| addIframeDashboard(); | ||
| }); | ||
|
|
||
| it('Logged user can choose iframe dashboard', () => { | ||
| addIframeDashboard() | ||
| .canBeSelected() | ||
| .assertIframeExists(); | ||
| }); |
There was a problem hiding this comment.
Added tests for Iframe widget
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
URL validation changed so we can use port numbers.
More Code refactoring and Iframe boards tests.
Types of changes
Checklist:
I hereby agree to the terms of the Cogboard Contributor License Agreement.