diff --git a/html/internal_dashboard/controllers/controller.php b/html/internal_dashboard/controllers/controller.php
index f2c1cc4cb0..bfa9efa763 100644
--- a/html/internal_dashboard/controllers/controller.php
+++ b/html/internal_dashboard/controllers/controller.php
@@ -151,7 +151,9 @@
header("Content-type: application/xls");
header("Content-Disposition:attachment;filename=\"xdmod_visitation_stats_by_$timeframe.csv\"");
- print implode(',', array_keys($response['stats'][0])) . "\n";
+ if (isset($response['stats'][0])) {
+ print implode(',', array_keys($response['stats'][0])) . "\n";
+ }
$previous_timeframe = '';
@@ -214,4 +216,4 @@
// =====================================================
-print json_encode($response);
\ No newline at end of file
+print json_encode($response);
diff --git a/html/internal_dashboard/controllers/pseudo_login.php b/html/internal_dashboard/controllers/pseudo_login.php
index 0cdc36d2af..e0e084d852 100644
--- a/html/internal_dashboard/controllers/pseudo_login.php
+++ b/html/internal_dashboard/controllers/pseudo_login.php
@@ -9,13 +9,14 @@
// ======================================================================
- function getAbsoluteURL() {
-
- $protocol = ($_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://';
-
- return $protocol.$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'];
-
- }//getAbsoluteURL
+function getAbsoluteURL()
+{
+ $protocol = 'http://';
+ if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') {
+ $protocol = 'https://';
+ }
+ return $protocol.$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'];
+}
// ======================================================================
diff --git a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/ReportBuilderTest.php b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/ReportBuilderTest.php
index 6bd875fd30..7ca947c03c 100644
--- a/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/ReportBuilderTest.php
+++ b/open_xdmod/modules/xdmod/integration_tests/lib/Controllers/ReportBuilderTest.php
@@ -268,35 +268,11 @@ public function testCreateReport(array $options)
}
// render the charts as volatile
- // also, ensure the chart values in the report data are up to date.
- $count = 1;
foreach ($chartParams as $chartData) {
- // first, retrieve the data previously gathered in the chart creation
- // & rendering loop above.
$params = $chartData['params'];
- $startDate = $chartData['start_date'];
- $endDate = $chartData['end_date'];
- $chartRef = $params['ref'];
- // generate the cacheRef && chartData keys & values.
- $chartCacheRefKey = "chart_cache_ref_$count";
- $chartCacheRef = "$startDate-$endDate;xd_report_$chartRef";
-
- $chartDataKey = "chart_data_$count";
- $chartDataValue = $chartData['chart_id'];
-
- // Update the chart type to volatile
$params['type'] = 'volatile';
-
- // render the volatile chart.
$this->reportImageRenderer($params);
-
- // Ensure that the chart_ref & chart_data values for this entry
- // are up to date.
- $data[$chartCacheRefKey] = $chartCacheRef;
- $data[$chartDataKey] = $chartDataValue;
-
- $count++;
}
// Retrieve the next available report name for this user.
diff --git a/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/XdmodTestHelper.php b/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/XdmodTestHelper.php
index dfbd0bf3fe..839748177a 100644
--- a/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/XdmodTestHelper.php
+++ b/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/XdmodTestHelper.php
@@ -194,6 +194,13 @@ public function authenticateSSO($parameters, $includeDefault = true)
list($action, $credentials) = $this->getHTMLFormData($result[0]);
$result = $this->post($action, null, $credentials, true);
+
+ if ($result[1]['http_code'] !== 200) {
+ throw new \Exception('SSO signin failure: HTTP code' . $result[1]['http_code']);
+ }
+ if (strpos($result[0], 'Logging you into XDMoD') === false) {
+ throw new \Exception('SSO signin failure: ' . $result[0]);
+ }
}
/**
diff --git a/shippable.yml b/shippable.yml
index c0a38991fd..fdb843c577 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -30,5 +30,6 @@ build:
- ./open_xdmod/modules/xdmod/automated_tests/runtests.sh --headless --log-junit `pwd`/shippable/testresults --sso
- ./vendor/phpunit/phpunit/phpunit -c ./open_xdmod/modules/xdmod/integration_tests/phpunit.xml.dist --testsuite sso --log-junit `pwd`/shippable/testresults/xdmod-sso-integration.xml
- mv ./configuration/portal_settings.ini.old ./configuration/portal_settings.ini
+ - if [ -s /var/log/xdmod/apache-error.log ]; then cat /var/log/xdmod/apache-error.log; false; fi
on_failure:
- cat /var/log/xdmod/*