@@ -63,7 +63,7 @@ |
||
63 | 63 | { |
64 | 64 | public function __construct($testEnvironmentName, $groupId, $hostId, $hostManager, $groupAdapter) |
65 | 65 | { |
66 | - $msg = "in test environment {$testEnvironmentName}, group {$groupId}, host {$hostId}: host adapter '" . gettype($hostManager) . "' isn't compatible with group of type '" . gettype($groupAdapter) . "'"; |
|
66 | + $msg = "in test environment {$testEnvironmentName}, group {$groupId}, host {$hostId}: host adapter '" . gettype($hostManager) . "' isn't compatible with group of type '" . gettype($groupAdapter) . "'"; |
|
67 | 67 | parent::__construct(400, $msg, $msg); |
68 | 68 | } |
69 | 69 | } |
70 | 70 | \ No newline at end of file |
@@ -63,7 +63,7 @@ |
||
63 | 63 | { |
64 | 64 | public function __construct($testEnvironmentName, $groupId) |
65 | 65 | { |
66 | - $msg = "in test environment {$testEnvironmentName}, group {$groupId}: need a group adapter first"; |
|
66 | + $msg = "in test environment {$testEnvironmentName}, group {$groupId}: need a group adapter first"; |
|
67 | 67 | parent::__construct(400, $msg, $msg); |
68 | 68 | } |
69 | 69 | } |
70 | 70 | \ No newline at end of file |
@@ -58,34 +58,34 @@ |
||
58 | 58 | */ |
59 | 59 | class DeviceLib |
60 | 60 | { |
61 | - /** |
|
62 | - * @param \DataSift\Stone\ObjectLib\BaseObject $deviceDetails |
|
63 | - */ |
|
64 | - public static function getDeviceAdapter($deviceDetails) |
|
65 | - { |
|
66 | - // which namespace do our device adapters live in? |
|
67 | - $namespace = 'DataSift\Storyplayer\DeviceLib\\'; |
|
61 | + /** |
|
62 | + * @param \DataSift\Stone\ObjectLib\BaseObject $deviceDetails |
|
63 | + */ |
|
64 | + public static function getDeviceAdapter($deviceDetails) |
|
65 | + { |
|
66 | + // which namespace do our device adapters live in? |
|
67 | + $namespace = 'DataSift\Storyplayer\DeviceLib\\'; |
|
68 | 68 | |
69 | - // where do we want to get the device from? |
|
70 | - $adapterClass = $namespace . $deviceDetails->adapter . 'Adapter'; |
|
69 | + // where do we want to get the device from? |
|
70 | + $adapterClass = $namespace . $deviceDetails->adapter . 'Adapter'; |
|
71 | 71 | |
72 | - // do we have the adapter? |
|
73 | - if (!class_exists($adapterClass)) { |
|
74 | - throw new E4xx_NoSuchDeviceAdapter($deviceDetails->adapter); |
|
75 | - } |
|
72 | + // do we have the adapter? |
|
73 | + if (!class_exists($adapterClass)) { |
|
74 | + throw new E4xx_NoSuchDeviceAdapter($deviceDetails->adapter); |
|
75 | + } |
|
76 | 76 | |
77 | - // create the adapter |
|
78 | - $deviceAdapter = new $adapterClass; |
|
77 | + // create the adapter |
|
78 | + $deviceAdapter = new $adapterClass; |
|
79 | 79 | |
80 | - // is this an adapter we're happy with? |
|
81 | - if (!$deviceAdapter instanceof \DataSift\Storyplayer\DeviceLib\DeviceAdapter) { |
|
82 | - throw new E5xx_BadDeviceAdapter($adapterClass); |
|
83 | - } |
|
80 | + // is this an adapter we're happy with? |
|
81 | + if (!$deviceAdapter instanceof \DataSift\Storyplayer\DeviceLib\DeviceAdapter) { |
|
82 | + throw new E5xx_BadDeviceAdapter($adapterClass); |
|
83 | + } |
|
84 | 84 | |
85 | - // initialise the adapter |
|
86 | - $deviceAdapter->init($deviceDetails); |
|
85 | + // initialise the adapter |
|
86 | + $deviceAdapter->init($deviceDetails); |
|
87 | 87 | |
88 | - // all done |
|
89 | - return $deviceAdapter; |
|
90 | - } |
|
88 | + // all done |
|
89 | + return $deviceAdapter; |
|
90 | + } |
|
91 | 91 | } |
92 | 92 | \ No newline at end of file |
@@ -89,7 +89,7 @@ |
||
89 | 89 | // make sure it is an array, as that is what the |
90 | 90 | // underlying WebDriver library requires |
91 | 91 | else if (is_object($browserDetails->desiredCapabilities)) { |
92 | - $browserDetails->desiredCapabilities = (array) ($browserDetails->desiredCapabilities); |
|
92 | + $browserDetails->desiredCapabilities = (array)($browserDetails->desiredCapabilities); |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 |
@@ -62,7 +62,8 @@ |
||
62 | 62 | * |
63 | 63 | * @param string $provider |
64 | 64 | */ |
65 | - public function __construct($provider) { |
|
65 | + public function __construct($provider) |
|
66 | + { |
|
66 | 67 | $msg = "Unknown device adapter '{$provider}'"; |
67 | 68 | parent::__construct(400, $msg, $msg); |
68 | 69 | } |
@@ -61,7 +61,8 @@ |
||
61 | 61 | /** |
62 | 62 | * @param string $classname |
63 | 63 | */ |
64 | - public function __construct($classname) { |
|
64 | + public function __construct($classname) |
|
65 | + { |
|
65 | 66 | $msg = "Unable to use class '{$classname}' as a device adapter; it does not implement the DeviceAdapter interface"; |
66 | 67 | parent::__construct(500, $msg, $msg); |
67 | 68 | } |
@@ -72,17 +72,17 @@ |
||
72 | 72 | // defaults for Chrome, running locally |
73 | 73 | $config = $this->newConfig('chrome')->getConfig(); |
74 | 74 | $config->adapter = 'LocalWebDriver'; |
75 | - $config->browser = 'chrome'; |
|
75 | + $config->browser = 'chrome'; |
|
76 | 76 | |
77 | 77 | // defaults for Firefox, running locally |
78 | 78 | $config = $this->newConfig('firefox')->getConfig(); |
79 | 79 | $config->adapter = 'LocalWebDriver'; |
80 | - $config->browser = 'firefox'; |
|
80 | + $config->browser = 'firefox'; |
|
81 | 81 | |
82 | 82 | // defaults for Safari, running locally |
83 | 83 | $config = $this->newConfig('safari')->getConfig(); |
84 | 84 | $config->adapter = 'LocalWebDriver'; |
85 | - $config->browser = 'safari'; |
|
85 | + $config->browser = 'safari'; |
|
86 | 86 | |
87 | 87 | // ---------------------------------------------------------------- |
88 | 88 | // |
@@ -70,17 +70,17 @@ |
||
70 | 70 | // defaults for Chrome, running locally |
71 | 71 | $this->chrome = new BaseObject; |
72 | 72 | $this->chrome->adapter = 'LocalWebDriver'; |
73 | - $this->chrome->browser = 'chrome'; |
|
73 | + $this->chrome->browser = 'chrome'; |
|
74 | 74 | |
75 | 75 | // defaults for Firefox, running locally |
76 | 76 | $this->firefox = new BaseObject; |
77 | 77 | $this->firefox->adapter = 'LocalWebDriver'; |
78 | - $this->firefox->browser = 'firefox'; |
|
78 | + $this->firefox->browser = 'firefox'; |
|
79 | 79 | |
80 | 80 | // defaults for Safari, running locally |
81 | 81 | $this->safari = new BaseObject; |
82 | 82 | $this->safari->adapter = 'LocalWebDriver'; |
83 | - $this->safari->browser = 'safari'; |
|
83 | + $this->safari->browser = 'safari'; |
|
84 | 84 | |
85 | 85 | // ---------------------------------------------------------------- |
86 | 86 | // |
@@ -73,10 +73,10 @@ |
||
73 | 73 | |
74 | 74 | // build the Sauce Labs url |
75 | 75 | $url = "http://" |
76 | - . urlencode($this->browserDetails->saucelabs->username) |
|
77 | - . ':' |
|
78 | - . urlencode($this->browserDetails->saucelabs->accesskey) |
|
79 | - . '@ondemand.saucelabs.com/wd/hub'; |
|
76 | + . urlencode($this->browserDetails->saucelabs->username) |
|
77 | + . ':' |
|
78 | + . urlencode($this->browserDetails->saucelabs->accesskey) |
|
79 | + . '@ondemand.saucelabs.com/wd/hub'; |
|
80 | 80 | |
81 | 81 | // build the Sauce Labs capabilities array |
82 | 82 | $desiredCapabilities = $this->browserDetails->desiredCapabilities; |
@@ -87,7 +87,7 @@ |
||
87 | 87 | // due to encoding errors at SauceLabs, we can't use '>' as a |
88 | 88 | // delimiter in the story's name |
89 | 89 | $story = $st->getStory(); |
90 | - $desiredCapabilities['name'] = $st->getTestEnvironmentName() . ' / ' . $st->getCurrentPhase() . ': ' . $st->getCurrentPhaseName() . ' / '. $story->getName(); |
|
90 | + $desiredCapabilities['name'] = $st->getTestEnvironmentName() . ' / ' . $st->getCurrentPhase() . ': ' . $st->getCurrentPhaseName() . ' / ' . $story->getName(); |
|
91 | 91 | |
92 | 92 | // create the browser session |
93 | 93 | $webDriver = new WebDriverClient($url); |
@@ -104,15 +104,13 @@ |
||
104 | 104 | public function stop() |
105 | 105 | { |
106 | 106 | // stop the web browser |
107 | - if (is_object($this->browserSession)) |
|
108 | - { |
|
107 | + if (is_object($this->browserSession)) { |
|
109 | 108 | $this->browserSession->close(); |
110 | 109 | $this->browserSession = null; |
111 | 110 | } |
112 | 111 | |
113 | 112 | // now stop the proxy |
114 | - if (is_object($this->proxySession)) |
|
115 | - { |
|
113 | + if (is_object($this->proxySession)) { |
|
116 | 114 | try { |
117 | 115 | $this->proxySession->close(); |
118 | 116 | } |