Skip container for simple widgets

Author: arrilot

spec/Arrilot/Widgets/Factories/WidgetFactorySpec.php

@@ -7,7 +7,6 @@
 use App\Widgets\TestDefaultSlider;
 use App\Widgets\TestMyClass;
 use App\Widgets\TestRepeatableFeed;
-use App\Widgets\TestWidgetWithCustomCssClass;
 use App\Widgets\TestWidgetWithDIInRun;
 use App\Widgets\TestWidgetWithParamsInRun;
 use Arrilot\Widgets\Misc\LaravelApplicationWrapper;
@@ -63,7 +62,7 @@ public function it_can_run_widget_from_default_namespace(LaravelApplicationWrapp
         );
         $this->testDefaultSlider()
             ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="arrilot-widget-container">Default test slider was executed with $slides = 6</div>'
+                'Default test slider was executed with $slides = 6'
             );
     }
 
@@ -74,7 +73,7 @@ public function it_can_run_widget_from_custom_namespace(LaravelApplicationWrappe
         );
         $this->slider()
             ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="arrilot-widget-container">Slider was executed with $slides = 6</div>'
+                'Slider was executed with $slides = 6'
             );
     }
 
@@ -85,7 +84,7 @@ public function it_provides_config_override(LaravelApplicationWrapper $wrapper)
         );
         $this->slider(['slides' => 5])
             ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="arrilot-widget-container">Slider was executed with $slides = 5</div>'
+                'Slider was executed with $slides = 5'
             );
     }
 
@@ -101,7 +100,7 @@ public function it_can_run_widgets_with_additional_params(LaravelApplicationWrap
         );
         $this->testWidgetWithParamsInRun([], 'asc')
             ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="arrilot-widget-container">TestWidgetWithParamsInRun was executed with $flag = asc</div>'
+                'TestWidgetWithParamsInRun was executed with $flag = asc'
             );
     }
 
@@ -112,7 +111,7 @@ public function it_can_run_widgets_with_method_injection(LaravelApplicationWrapp
         );
         $this->testWidgetWithParamsInRun()
             ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="arrilot-widget-container">bar</div>'
+                'bar'
             );
     }
 
@@ -123,7 +122,7 @@ public function it_can_run_widgets_with_run_method(LaravelApplicationWrapper $wr
         );
         $this->run('testDefaultSlider')
             ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="arrilot-widget-container">Default test slider was executed with $slides = 6</div>'
+                'Default test slider was executed with $slides = 6'
             );
     }
 
@@ -134,7 +133,7 @@ public function it_can_run_widgets_with_run_method_and_config_override(LaravelAp
         );
         $this->run('slider', ['slides' => 5])
             ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="arrilot-widget-container">Slider was executed with $slides = 5</div>'
+                'Slider was executed with $slides = 5'
             );
     }
 
@@ -145,7 +144,7 @@ public function it_can_run_nested_widgets(LaravelApplicationWrapper $wrapper)
         );
         $this->run('Profile\TestNamespace\TestFeed', ['slides' => 5])
             ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="arrilot-widget-container">Feed was executed with $slides = 6</div>'
+                'Feed was executed with $slides = 6'
             );
     }
 
@@ -156,7 +155,7 @@ public function it_can_run_nested_widgets_with_dot_notation(LaravelApplicationWr
         );
         $this->run('profile.testNamespace.testFeed', ['slides' => 5])
             ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="arrilot-widget-container">Feed was executed with $slides = 6</div>'
+                'Feed was executed with $slides = 6'
             );
     }
 
@@ -167,15 +166,15 @@ public function it_can_run_multiple_widgets(LaravelApplicationWrapper $wrapper)
         );
         $this->slider()
             ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="arrilot-widget-container">Slider was executed with $slides = 6</div>'
+                'Slider was executed with $slides = 6'
             );
 
         $wrapper->call(Argument::any(), Argument::any())->willReturn(
             call_user_func_array([new Slider(['slides' => 5]), 'run'], ['slides' => 5])
         );
         $this->slider(['slides' => 5])
             ->shouldReturn(
-                '<div id="arrilot-widget-container-2" style="display:inline" class="arrilot-widget-container">Slider was executed with $slides = 5</div>'
+                'Slider was executed with $slides = 5'
             );
     }
 
@@ -197,17 +196,6 @@ public function it_can_run_async_widget(LaravelApplicationWrapper $wrapper)
             );
     }
 
-    public function it_can_be_configurate_to_use_custom_css_class_in_wrapper(LaravelApplicationWrapper $wrapper)
-    {
-        $wrapper->call(Argument::any(), Argument::any())->willReturn(
-            call_user_func_array([new TestWidgetWithCustomCssClass([]), 'run'], [])
-        );
-        $this->run('testWidgetWithCustomCssClass')
-            ->shouldReturn(
-                '<div id="arrilot-widget-container-1" style="display:inline" class="dummyClass">Dummy Content</div>'
-            );
-    }
-
     public function it_can_cache_widgets(LaravelApplicationWrapper $wrapper)
     {
         $wrapper->call(Argument::any(), Argument::any())->willReturn(

src/Factories/WidgetFactory.php

@@ -34,9 +34,10 @@ public function run()
 
         if ($timeout = $this->getReloadTimeout()) {
             $content .= $this->javascriptFactory->getReloader($timeout);
+            return $this->wrapContentInContainer($content);
         }
 
-        return $this->wrapContentInContainer($content);
+        return $content;
     }
 
     /**