From 8269cc6fa1fe23b8e716e8d8c4688766db90773e Mon Sep 17 00:00:00 2001
From: Serhii Tsymbaliuk <stsymbal@redhat.com>
Date: Tue, 29 Oct 2019 17:47:27 +0100
Subject: [PATCH 1/2] Web UI: Use system jQuery bundle

Signed-off-by: Serhii Tsymbaliuk <stsymbal@redhat.com>
---
 freeipa.spec.in                | 5 +++++
 install/html/ssbrowser.html    | 2 +-
 install/html/unauthorized.html | 2 +-
 install/migration/index.html   | 2 +-
 install/ui/index.html          | 2 +-
 install/ui/reset_password.html | 2 +-
 install/ui/sync_otp.html       | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 27d19909b1..135f3bddc6 100755
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -176,6 +176,7 @@ BuildRequires:  libunistring-devel
 # 0.13.0: https://bugzilla.redhat.com/show_bug.cgi?id=1584773
 # 0.13.0-2: fix for missing dependency on python-six
 BuildRequires:  python3-lesscpy >= 0.13.0-2
+BuildRequires:  web-assets-devel
 
 # ONLY_CLIENT
 %endif
@@ -334,6 +335,10 @@ Requires: oddjob
 Requires: gssproxy >= 0.7.0-2
 Requires: sssd-dbus >= %{sssd_version}
 
+# Dependencies for Web UI
+Requires: web-assets-httpd
+Requires: js-jquery
+
 Provides: %{alt_name}-server = %{version}
 Conflicts: %{alt_name}-server
 Obsoletes: %{alt_name}-server < %{version}
diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html
index faa7e657be..82ed3c2241 100644
--- a/install/html/ssbrowser.html
+++ b/install/html/ssbrowser.html
@@ -33,7 +33,7 @@
                 '../ui/css/ipa.css'
             ];
             var scripts = [
-                '../ui/js/libs/jquery.js',
+                '/.sysassets/jquery/3/jquery.min.js',
                 '../ui/js/libs/jquery.ordered-map.js',
                 '../ui/js/dojo/dojo.js'
             ];
diff --git a/install/html/unauthorized.html b/install/html/unauthorized.html
index 630982da89..3f3a453075 100644
--- a/install/html/unauthorized.html
+++ b/install/html/unauthorized.html
@@ -33,7 +33,7 @@
                 '../ui/css/ipa.css'
             ];
             var scripts = [
-                '../ui/js/libs/jquery.js',
+                '/.sysassets/jquery/3/jquery.min.js',
                 '../ui/js/libs/jquery.ordered-map.js',
                 '../ui/js/dojo/dojo.js'
             ];
diff --git a/install/migration/index.html b/install/migration/index.html
index fca517cdcf..f9eb91e512 100644
--- a/install/migration/index.html
+++ b/install/migration/index.html
@@ -43,7 +43,7 @@
             if (ie) styles.push('ie.css');
             var icons = ['favicon.ico'];
             var scripts = [
-                'js/libs/jquery.js',
+                '/.sysassets/jquery/3/jquery.min.js',
                 'js/libs/jquery.ordered-map.js',
                 'js/dojo/dojo.js'
             ];
diff --git a/install/ui/index.html b/install/ui/index.html
index bc0f0cd1e8..9c3e116439 100644
--- a/install/ui/index.html
+++ b/install/ui/index.html
@@ -49,7 +49,7 @@
             var icons = ['favicon.ico'];
             var scripts = [
                 'js/libs/json2.js',
-                'js/libs/jquery.js',
+                '/.sysassets/jquery/3/jquery.min.js',
                 'js/libs/bootstrap.js',
                 'js/libs/bootstrap-datepicker.js',
                 'js/libs/patternfly.js',
diff --git a/install/ui/reset_password.html b/install/ui/reset_password.html
index e5700c9647..f7812a36be 100644
--- a/install/ui/reset_password.html
+++ b/install/ui/reset_password.html
@@ -44,7 +44,7 @@
             var icons = ['favicon.ico'];
             var scripts = [
                 'js/libs/json2.js',
-                'js/libs/jquery.js',
+                '/.sysassets/jquery/3/jquery.min.js',
                 'js/libs/bootstrap.js',
                 'js/libs/jquery.ordered-map.js',
                 'js/libs/browser.js',
diff --git a/install/ui/sync_otp.html b/install/ui/sync_otp.html
index 5814b6c578..7ba06391cc 100644
--- a/install/ui/sync_otp.html
+++ b/install/ui/sync_otp.html
@@ -40,7 +40,7 @@
             var icons = ['favicon.ico'];
             var scripts = [
                 'js/libs/json2.js',
-                'js/libs/jquery.js',
+                '/.sysassets/jquery/3/jquery.min.js',
                 'js/libs/bootstrap.js',
                 'js/libs/jquery.ordered-map.js',
                 'js/libs/browser.js',

From 0272242b52203898108b83211f5b649b723ee021 Mon Sep 17 00:00:00 2001
From: Serhii Tsymbaliuk <stsymbal@redhat.com>
Date: Tue, 29 Oct 2019 17:51:00 +0100
Subject: [PATCH 2/2] Temp commit

---
 .freeipa-pr-ci.yaml                        |  2 +-
 ipatests/prci_definitions/temp_commit.yaml | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml
index abcf8c5b63..8065669008 120000
--- a/.freeipa-pr-ci.yaml
+++ b/.freeipa-pr-ci.yaml
@@ -1 +1 @@
-ipatests/prci_definitions/gating.yaml
\ No newline at end of file
+ipatests/prci_definitions/temp_commit.yaml
\ No newline at end of file
diff --git a/ipatests/prci_definitions/temp_commit.yaml b/ipatests/prci_definitions/temp_commit.yaml
index f3145fddf3..5fd51baa19 100644
--- a/ipatests/prci_definitions/temp_commit.yaml
+++ b/ipatests/prci_definitions/temp_commit.yaml
@@ -57,14 +57,18 @@ jobs:
         timeout: 1800
         topology: *build
 
-  fedora-30/temp_commit:
+  fedora-30/test_webui_general:
     requires: [fedora-30/build]
     priority: 50
     job:
-      class: RunPytest
+      class: RunWebuiTests
       args:
         build_url: '{fedora-30/build_url}'
-        test_suite: test_integration/test_REPLACEME.py
+        test_suite: >-
+          test_webui/test_loginscreen.py
+          test_webui/test_misc_cases.py
+          test_webui/test_navigation.py
+          test_webui/test_translation.py
         template: *ci-master-f30
         timeout: 3600
-        topology: *master_1repl_1client
+        topology: *ipaserver
