From 89e661f18c1701c91b7b02cc34dc39999e114bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Fri, 19 Aug 2016 06:53:18 +0200
Subject: [PATCH] tools.deploy.config: fix + tc for the deploy help error
 (#1692)

---
 basis/tools/deploy/config/config-tests.factor | 22 ++++++++++++++++++-
 basis/tools/deploy/config/config.factor       |  4 +++-
 basis/tools/deploy/deploy-tests.factor        |  2 ++
 basis/tools/deploy/test/23/23.factor          | 11 ++++++++++
 basis/tools/deploy/test/23/deploy.factor      | 16 ++++++++++++++
 5 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 basis/tools/deploy/test/23/23.factor
 create mode 100644 basis/tools/deploy/test/23/deploy.factor

diff --git a/basis/tools/deploy/config/config-tests.factor b/basis/tools/deploy/config/config-tests.factor
index 9ba9f2c3b8..ee0682f0fb 100644
--- a/basis/tools/deploy/config/config-tests.factor
+++ b/basis/tools/deploy/config/config-tests.factor
@@ -1,6 +1,26 @@
 USING: tools.deploy.config tools.test ;
 IN: tools.deploy.config.tests
 
-{ { "math" "threads" "compiler" "io" } } [
+! config>profile
+{
+    { "math" "threads" "compiler" "io" }
+    { "math" "threads" "compiler" "io" "ui" "unicode" "help" }
+} [
     "hello-ui" default-config config>profile
+
+    H{
+        { deploy-console? t }
+        { deploy-io 3 }
+        { deploy-reflection 6 }
+        { deploy-ui? t }
+        { deploy-word-defs? t }
+        { deploy-threads? t }
+        { "stop-after-last-window?" t }
+        { deploy-math? t }
+        { deploy-word-props? t }
+        { deploy-c-types? t }
+        { deploy-help? t }
+        { deploy-name "deploytest" }
+        { deploy-unicode? t }
+    } config>profile
 ] unit-test
diff --git a/basis/tools/deploy/config/config.factor b/basis/tools/deploy/config/config.factor
index 16a8e90635..9075e87eb1 100644
--- a/basis/tools/deploy/config/config.factor
+++ b/basis/tools/deploy/config/config.factor
@@ -73,11 +73,13 @@ SYMBOL: deploy-directory
 
 : config>profile ( config -- profile )
     {
+        ! The order should be similar to default-components in
+        ! bootstrap.stage2.
         [ deploy-math? of "math" f ? ]
         [ deploy-threads? of "threads" f ? ]
         [ drop "compiler" ]
-        [ deploy-help? of "help" f ? ]
         [ deploy-io of 3 = "io" f ? ]
         [ deploy-ui? of "ui" f ? ]
         [ deploy-unicode? of "unicode" f ? ]
+        [ deploy-help? of "help" f ? ]
     } cleave>array sift ;
diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index 2fb78ae7e3..e53ca0a76d 100644
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -180,3 +180,5 @@ os macosx? [
 { } [ "tools.deploy.test.21" drop 1260000 small-enough? ] unit-test
 
 { } [ "benchmark.ui-panes" shake-and-bake run-temp-image ] unit-test
+
+{ } [ "tools.deploy.test.23" shake-and-bake ] unit-test
diff --git a/basis/tools/deploy/test/23/23.factor b/basis/tools/deploy/test/23/23.factor
new file mode 100644
index 0000000000..9ad062bae6
--- /dev/null
+++ b/basis/tools/deploy/test/23/23.factor
@@ -0,0 +1,11 @@
+! As reported in #1691 and #1692
+USING: ui ui.gadgets.labels ui.gadgets.scrollers ;
+IN: tools.deploy.test.23
+
+: (main) ( -- )
+  "test" <label> <scroller> "test" open-window ;
+
+: main ( -- )
+  [ (main) ] with-ui ;
+
+MAIN: main
diff --git a/basis/tools/deploy/test/23/deploy.factor b/basis/tools/deploy/test/23/deploy.factor
new file mode 100644
index 0000000000..3a055e3ac7
--- /dev/null
+++ b/basis/tools/deploy/test/23/deploy.factor
@@ -0,0 +1,16 @@
+USING: tools.deploy.config ;
+H{
+    { deploy-console? t }
+    { deploy-io 3 }
+    { deploy-reflection 6 }
+    { deploy-ui? t }
+    { deploy-word-defs? t }
+    { deploy-threads? t }
+    { "stop-after-last-window?" t }
+    { deploy-math? t }
+    { deploy-word-props? t }
+    { deploy-c-types? t }
+    { deploy-help? t }
+    { deploy-name "tools.deploy.test.23" }
+    { deploy-unicode? t }
+}