1
=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
2
--- src/app/webcontainer/WebViewImplOxide.qml	2016-07-13 16:23:18 +0000
3
+++ src/app/webcontainer/WebViewImplOxide.qml	2016-09-01 16:02:36 +0000
4
@@ -131,9 +131,6 @@
5
131
        onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
131
        onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
6
132
    }
132
    }
7
133
133
8
134
    StateSaver.properties: "url"
9
135
    StateSaver.enabled: !runningLocalApplication
10
136
11
137
    function handleSAMLRequestPattern(urlPattern) {
134
    function handleSAMLRequestPattern(urlPattern) {
12
138
        webappUrlPatterns.push(urlPattern)
135
        webappUrlPatterns.push(urlPattern)
13
139
136
14
140
137
15
=== modified file 'src/app/webcontainer/WebappContainerWebview.qml'
16
--- src/app/webcontainer/WebappContainerWebview.qml	2016-07-13 16:23:18 +0000
17
+++ src/app/webcontainer/WebappContainerWebview.qml	2016-09-01 16:02:36 +0000
18
@@ -46,6 +46,12 @@
19
46
    signal samlRequestUrlPatternReceived(string urlPattern)
46
    signal samlRequestUrlPatternReceived(string urlPattern)
20
47
    signal themeColorMetaInformationDetected(string theme_color)
47
    signal themeColorMetaInformationDetected(string theme_color)
21
48
48
22
49
    onWebappNameChanged: {
23
50
        if (webappContainerWebViewLoader.item) {
24
51
            webappContainerWebViewLoader.item.webappName = webappName
25
52
        }
26
53
    }
27
54
28
49
    onWideChanged: {
55
    onWideChanged: {
29
50
        if (webappContainerWebViewLoader.item
56
        if (webappContainerWebViewLoader.item
30
51
                && webappContainerWebViewLoader.item.wide !== undefined) {
57
                && webappContainerWebViewLoader.item.wide !== undefined) {
31
52
58
32
=== modified file 'src/app/webcontainer/webapp-container.qml'
33
--- src/app/webcontainer/webapp-container.qml	2016-07-13 16:23:18 +0000
34
+++ src/app/webcontainer/webapp-container.qml	2016-09-01 16:02:36 +0000
35
@@ -227,6 +227,9 @@
36
227
        onlineAccountsController.visible = true
227
        onlineAccountsController.visible = true
37
228
    }
228
    }
38
229
229
39
230
    StateSaver.properties: "url"
40
231
    StateSaver.enabled: !runningLocalApplication
41
232
42
230
    function startBrowsing() {
233
    function startBrowsing() {
43
231
        console.log("Start browsing")
234
        console.log("Start browsing")
44
232
        // This will activate the UnityWebApp element used in WebApp.qml
235
        // This will activate the UnityWebApp element used in WebApp.qml
45
@@ -236,10 +239,7 @@
46
236
        // it has not been set previously before setting the URL to the default property 
239
        // it has not been set previously before setting the URL to the default property 
47
237
        // homepage.
240
        // homepage.
48
238
        var webView = webappViewLoader.item.currentWebview
241
        var webView = webappViewLoader.item.currentWebview
53
239
        var current_url = webView.url.toString();
242
        webView.url = root.url
50
240
        if (!current_url || current_url.length === 0) {
51
241
            webView.url = root.url
52
242
        }
54
243
        showWebView()
243
        showWebView()
55
244
    }
244
    }
56
245
245
57
246
246
58
=== modified file 'tests/autopilot/webapp_container/tests/test_app_launch.py'
59
--- tests/autopilot/webapp_container/tests/test_app_launch.py	2016-06-17 18:03:09 +0000
60
+++ tests/autopilot/webapp_container/tests/test_app_launch.py	2016-09-01 16:02:36 +0000
61
@@ -104,3 +104,27 @@
62
104
            result = 'test'
104
            result = 'test'
63
105
            self.assertThat(self.get_webcontainer_window().title,
105
            self.assertThat(self.get_webcontainer_window().title,
64
106
                            Eventually(Equals(result)))
106
                            Eventually(Equals(result)))
65
107
66
108
            self.assertThat(lambda: self.get_oxide_webview().webappName,
67
109
                            Eventually(Equals(result)))
68
110
69
111
    def test_webapps_launch_with_external_url(self):
70
112
        args = ["--webapp='dGVzdA=='", "http://www.test.com/test"]
71
113
        rule = 'MAP *.test.com:80 ' + self.get_base_url_hostname()
72
114
        with generate_temp_webapp() as webapp_install_path:
73
115
            env_vars = {
74
116
                'UBUNTU_WEBVIEW_HOST_MAPPING_RULES': rule,
75
117
                'WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER': (
76
118
                    webapp_install_path)
77
119
            }
78
120
            self.launch_webcontainer_app(args, env_vars)
79
121
            webview = self.get_oxide_webview()
80
122
            webapp_url = 'http://www.test.com/test'
81
123
            self.assertThat(webview.url, Eventually(Equals(webapp_url)))
82
124
83
125
            result = 'test'
84
126
            self.assertThat(self.get_webcontainer_window().title,
85
127
                            Eventually(Equals(result)))
86
128
87
129
            self.assertThat(lambda: self.get_oxide_webview().webappName,
88
130
                            Eventually(Equals(result)))
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-09-01
Ubuntu Phablet Team		2016-09-01	Pending
Review via email: mp+304666@code.launchpad.net