Merge branch 'master' of github.com:Tradeshift/tradeshift-ui into v11…

…/20px-unit-new-colors * 'master' of github.com:Tradeshift/tradeshift-ui: [release-it] --no-merges in changelog Release v10.1.1 [scripts] npm run http will run on 0.0.0.0 [CompanyCardSpirit] Re-enable `data-ts.render="encodedJSON"`-style test for all browsers [gui.ConfigPlugin] Call `div.onclick()` if `div.click()` didn't give any results [Table] fix small typos # Conflicts: # package.json # src/spiritual/spiritual-gui/[email protected]/plugins/config/gui.ConfigPlugin.js
Tradeshift · Oct 17, 2018 · e2d878d · e2d878d
2 parents f384128 + 05a2858
commit e2d878d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/.release-it.beta.json b/.release-it.beta.json
@@ -3,7 +3,8 @@
 	"verbose": true,
 	"requireCleanWorkingDir": false,
 	"preRelease": "beta",
-	"changelogCommand": "echo \"### Commits\n$(git log --pretty=format:'* %s (%h)' [REV_RANGE])\"",
+	"changelogCommand":
+		"echo \"### Commits\n$(git log --no-merges --pretty=format:'* %s (%h)' [REV_RANGE])\"",
 	"src": {
 		"commitMessage": "Pre-release v%s",
 		"tagName": "v%s",

diff --git a/.release-it.json b/.release-it.json
@@ -2,7 +2,8 @@
 	"non-interactive": true,
 	"verbose": true,
 	"requireCleanWorkingDir": true,
-	"changelogCommand": "echo \"### Commits\n$(git log --pretty=format:'* %s (%h)' [REV_RANGE])\"",
+	"changelogCommand":
+		"echo \"### Commits\n$(git log --no-merges --pretty=format:'* %s (%h)' [REV_RANGE])\"",
 	"src": {
 		"commitMessage": "Release v%s",
 		"tagName": "v%s",

diff --git a/docs/src/xhtml/components/spinners/index.xhtml b/docs/src/xhtml/components/spinners/index.xhtml
@@ -101,7 +101,7 @@
 							<figure data-ts="DoxScript">
 								<script type="runnable">
 									ts.ui.get('#mytable', table => {
-										table.cols(['One', 'Two', 'Tree']);
+										table.cols(['One', 'Two', 'Three']);
 										table.rows([
 											['A', 'D', 'G'],
 											['B', 'E', 'H'],

diff --git a/docs/src/xhtml/components/table/building.xhtml b/docs/src/xhtml/components/table/building.xhtml
@@ -16,7 +16,7 @@
 							<figure data-ts="DoxScript" class="attention">
 								<script type="runnable">
 									ts.ui.get('#mytable', table => {
-										table.cols(['One', 'Two', 'Tree']);
+										table.cols(['One', 'Two', 'Three']);
 										table.rows([
 											['A', 'D', 'G'],
 											['B', 'E', 'H'],

diff --git a/package.json b/package.json
@@ -33,7 +33,8 @@
     "prelease": "release-it --config=.release-it.beta.json --npm.tag=next",
     "****** TEST *****": "",
     "test": "npm run eslint & grunt jasmine & wait && node tasks/browserstack.js",
-    "http": "static spec/jasmine -H '{\"Cache-Control\": \"no-cache, must-revalidate\"}'",
+    "http":
+      "static spec/jasmine -H '{\"Cache-Control\": \"no-cache, must-revalidate\"}' -a 0.0.0.0",
     "****** NODE *****": "",
     "postinstall": "cd docs && npm ci",
     "precommit": "lint-staged",

diff --git a/spec/runtime/spirits/[email protected]/ts.ui.CompanyCardSpirit.spec.js b/spec/runtime/spirits/[email protected]/ts.ui.CompanyCardSpirit.spec.js
@@ -42,26 +42,23 @@ describe('ts.ui.CompanyCardSpirit', function likethis() {
 		});
 	});
 
-	// disable flaky test for IE machines...
-	if (!gui.Client.isExplorer && !gui.Client.isEdge) {
-		it('should generate HTML via ts.render="encodedjson"', function(done) {
-			var spirit,
-				dom = helper.createTestDom();
-			var encodedjson = encodeURIComponent(JSON.stringify(CARDDATA).trim());
-			dom.innerHTML = '<div data-ts="CompanyCard" data-ts.render="' + encodedjson + '"></div>';
-			sometime(function later() {
-				spirit = ts.ui.get(dom.querySelector('div'));
-				var html = spirit.element.innerHTML.replace(/&amp;/g, '&');
-				Object.keys(CARDDATA.data).forEach(function(key) {
-					if (key === 'connection') {
-						expect(html).toContain('Connected');
-					} else {
-						var value = CARDDATA.data[key];
-						expect(html).toContain(value);
-					}
-				});
-				done();
+	it('should generate HTML via ts.render="encodedjson"', function(done) {
+		var spirit,
+			dom = helper.createTestDom();
+		var encodedjson = encodeURIComponent(JSON.stringify(CARDDATA).trim());
+		dom.innerHTML = '<div data-ts="CompanyCard" data-ts.render="' + encodedjson + '"></div>';
+		sometime(function later() {
+			spirit = ts.ui.get(dom.querySelector('div'));
+			var html = spirit.element.innerHTML.replace(/&amp;/g, '&');
+			Object.keys(CARDDATA.data).forEach(function(key) {
+				if (key === 'connection') {
+					expect(html).toContain('Connected');
+				} else {
+					var value = CARDDATA.data[key];
+					expect(html).toContain(value);
+				}
 			});
+			done();
 		});
-	}
+	});
 });