Skip to content

Commit 14a6ff9

Browse files
committed
Fix e2e tests
1 parent d199e12 commit 14a6ff9

10 files changed

Lines changed: 156 additions & 246 deletions

File tree

package-lock.json

Lines changed: 32 additions & 107 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"@types/jasmine": "^3.3.0",
4747
"@types/karma": "^3.0.0",
4848
"@types/node": "^10.12.10",
49-
"@types/react": "^16.7.7",
50-
"@types/react-dom": "^16.0.10",
49+
"@types/react": "^16.7.10",
50+
"@types/react-dom": "^16.0.11",
5151
"@types/react-select": "^1.3.0",
5252
"@types/webdriverio": "^4.13.0",
5353
"check-dependencies": "^1.0.1",
@@ -82,7 +82,7 @@
8282
"mendix-client": "^7.15.4",
8383
"mendix-widget-build-script": "^1.0.0-rc2",
8484
"node-sass": "^4.10.0",
85-
"nodemon": "^1.18.6",
85+
"nodemon": "^1.18.7",
8686
"pre-commit": "^1.2.2",
8787
"raw-loader": "^0.5.1",
8888
"react": "^16.6.3",
@@ -94,16 +94,16 @@
9494
"serviceworker-webpack-plugin": "^1.0.0-alpha02",
9595
"source-map-loader": "^0.2.4",
9696
"style-loader": "^0.23.1",
97-
"ts-loader": "^5.3.0",
97+
"ts-loader": "^5.3.1",
9898
"tslint": "^5.11.0",
9999
"tslint-eslint-rules": "^5.4.0",
100-
"typescript": "^3.1.6",
100+
"typescript": "^3.2.1",
101101
"wdio-dot-reporter": "0.0.10",
102102
"wdio-jasmine-framework": "^0.3.7",
103103
"wdio-selenium-standalone-service": "0.0.11",
104104
"wdio-spec-reporter": "^0.1.3",
105105
"webdriverio": "^4.14.0",
106-
"webpack": "^4.26.0",
106+
"webpack": "^4.26.1",
107107
"webpack-bundle-analyzer": "^3.0.3",
108108
"webpack-cli": "^3.1.2",
109109
"webpack-dev-server": "^3.1.10",

src/DropdownReference/components/DropdownReferenceContainer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ class DropdownReferenceContainer extends Component<ContainerProps, ContainerStat
113113
}
114114

115115
private isReadOnly = (): boolean => {
116-
const { editable, mxObject, readOnly, attribute } = this.props;
116+
const { editable, mxObject, readOnly } = this.props;
117117

118-
return editable !== "default" || (!mxObject || readOnly || !!(attribute && mxObject.isReadonlyAttr(attribute)));
118+
return editable !== "default" || !mxObject || readOnly;
119119
}
120120

121121
private resetSubscriptions(mxObject?: mendix.lib.MxObject) {

src/DropdownReferenceSet/components/DropdownReferenceSetContainer.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ class DropdownReferenceSetContainer extends Component<ContainerProps, ContainerS
9393
}
9494

9595
private isReadOnly = (): boolean => {
96-
const { editable, mxObject, readOnly, attribute } = this.props;
96+
const { editable, mxObject, readOnly } = this.props;
9797

98-
return editable !== "default" || (!mxObject || readOnly || !(attribute && mxObject.isReadonlyAttr(attribute)));
98+
return editable !== "default" || !mxObject || readOnly;
9999
}
100100

101101
private resetSubscriptions(mxObject?: mendix.lib.MxObject) {
@@ -127,7 +127,7 @@ class DropdownReferenceSetContainer extends Component<ContainerProps, ContainerS
127127
}
128128
}
129129

130-
private onChange(recentSelection: ReferenceOption[] | any) {
130+
private onChange(recentSelection: ReferenceOption[]) {
131131
if (this.props.mxObject) {
132132
const selectedOptions: string[] = [];
133133

src/SharedResources/components/Label.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ export interface LabelProps {
1111

1212
export const Label: FunctionComponent<LabelProps> = ({ children, className, label, style, weight, orientation }) => {
1313
weight = (weight > 11 || weight < 1) ? 3 : weight;
14-
const labelWeight = orientation === "horizontal" ? `col-sm-${weight}` : "col-sm-1";
15-
const childrenWeight = orientation === "horizontal" ? `col-sm-${12 - weight}` : "col-sm-12";
14+
const labelWeight = orientation === "horizontal" ? `col-sm-${weight}` : "";
15+
const childrenWeight = orientation === "horizontal" ? `col-sm-${12 - weight}` : "";
1616

1717
return createElement("div", { className: classNames("form-group", className), style },
1818
createElement("label", { className: `control-label ${labelWeight}` }, label),

0 commit comments

Comments
 (0)