Completed
Pull Request — master (#43)
by Jason
02:27
created
tests/SlideImageTest.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-class SlideImageTest extends FlexSliderTest{
3
+class SlideImageTest extends FlexSliderTest {
4 4
 
5 5
 	protected static $use_draft_site = true;
6 6
 
7
-	function setUp(){
7
+	function setUp() {
8 8
 		parent::setUp();
9 9
 	}
10 10
 
11
-	function testSlideImageCreation(){
11
+	function testSlideImageCreation() {
12 12
 
13 13
 		$this->logInWithPermission('Slide_CREATE');
14 14
 		$slide = $this->objFromFixture('SlideImage', 'slide1');
@@ -20,11 +20,11 @@  discard block
 block discarded – undo
20 20
 		$this->assertTrue($slideID > 0);
21 21
 
22 22
 		$getSlide = SlideImage::get()->byID($slideID);
23
-		$this->assertTrue($getSlide->ID == $slideID);
23
+		$this->assertTrue($getSlide->ID==$slideID);
24 24
 
25 25
 	}
26 26
 
27
-	function testSlideUpdate(){
27
+	function testSlideUpdate() {
28 28
 
29 29
 		$this->logInWithPermission('ADMIN');
30 30
 		$slide = $this->objFromFixture('SlideImage', 'slide1');
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
 
47 47
 		$slide = SlideImage::get()->byiD($slideID);
48 48
 
49
-		$this->assertTrue($slide->Name == $newTitle);
49
+		$this->assertTrue($slide->Name==$newTitle);
50 50
 
51 51
 	}
52 52
 
53
-	function testSlideImageDeletion(){
53
+	function testSlideImageDeletion() {
54 54
 
55 55
 		$this->logInWithPermission('Slide_DELETE');
56 56
 		$slide = $this->objFromFixture('SlideImage', 'slide2');
Please login to merge, or discard this patch.
tests/FlexSliderTest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-class FlexSliderTest extends FunctionalTest{
3
+class FlexSliderTest extends FunctionalTest {
4 4
 
5 5
 	protected static $fixture_file = 'flexslider/tests/FlexSliderTest.yml';
6 6
 	protected static $disable_themes = true;
7 7
 	protected static $use_draft_site = false;
8 8
 
9
-	public function setUp(){
9
+	public function setUp() {
10 10
 		parent::setUp();
11 11
 
12 12
 		ini_set('display_errors', 1);
@@ -14,11 +14,11 @@  discard block
 block discarded – undo
14 14
 		error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
15 15
 	}
16 16
 
17
-	public function logOut(){
17
+	public function logOut() {
18 18
 		$this->session()->clear('loggedInAs');
19 19
 		$this->session()->clear('logInWithPermission');
20 20
 	}
21 21
 
22
-	public function testFlexSlider(){}
22
+	public function testFlexSlider() {}
23 23
 
24 24
 }
Please login to merge, or discard this patch.
code/FlexSliderExtension.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -20,14 +20,14 @@  discard block
 block discarded – undo
20 20
 
21 21
         // only call custom script if page has Slides and DataExtension
22 22
         if (Object::has_extension($this->owner->data()->ClassName, 'FlexSlider')) {
23
-            if($this->owner->data()->Slides()->exists()){
23
+            if ($this->owner->data()->Slides()->exists()) {
24 24
                 Requirements::customScript("
25 25
                 (function($) {
26 26
                     $(document).ready(function(){
27 27
                         $('.flexslider').flexslider({
28
-                            slideshow: " . $animate . ",
29
-                            animation: '" . $this->owner->Animation . "',
30
-                            animationLoop: " . $loop . ",
28
+                            slideshow: " . $animate.",
29
+                            animation: '" . $this->owner->Animation."',
30
+                            animationLoop: " . $loop.",
31 31
                             controlNav: true,
32 32
                             directionNav: true,
33 33
                             prevText: '',
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
                             },
41 41
                             before: ".$before.",
42 42
                             after: ".$after.",
43
-                            slideshowSpeed: " . $speed . "
43
+                            slideshowSpeed: " . $speed."
44 44
                         });
45 45
                     });
46 46
                 }(jQuery));");
Please login to merge, or discard this patch.