[Behat][Admin][Customer] Fixes after changes displaying statistics

GSadee · GSadee · commit 13085d91f094 · 2017-03-02T08:10:59.000+01:00
diff --git a/features/user/managing_customers/seeing_orders_statistics_on_customer_details_page.feature b/features/user/managing_customers/seeing_orders_statistics_on_customer_details_page.feature
@@ -17,13 +17,6 @@ Feature: Seeing customer's orders' statistics
         When I view details of the customer "b.baggins@shire.me"
         Then I should see the customer has not placed any orders yet
 
-    @ui
-    Scenario: Seeing customer's all placed orders count
-        Given customer "lirael.clayr@abhorsen.ok" has placed 5 orders on the "Web-US" channel in each buying 3 "Onion" products
-        And this customer has also placed 12 orders on the "Web-UK" channel in each buying 20 "Onion" products
-        When I view their details
-        Then I should see that they have placed 17 orders across all channels
-
     @ui
     Scenario: Seeing how many orders the customer has placed in specific channel
         Given customer "lirael.clayr@abhorsen.ok" has placed 12 orders on the "Web-UK" channel in each buying 2 "Onion" products
diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingCustomersContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingCustomersContext.php
@@ -618,14 +618,6 @@ public function iShouldSeeTheCustomerHasNotYetPlacedAnyOrders()
         Assert::false($this->showPage->hasCustomerPlacedAnyOrders());
     }
 
-    /**
-     * @Then /^I should see that they have placed (\d+) orders? across all channels$/
-     */
-    public function iShouldSeeThatTheyHavePlacedOrdersAcrossAllChannels($orderCount)
-    {
-        Assert::same($this->showPage->getOverallOrdersCount(), (int) $orderCount);
-    }
-
     /**
      * @Then /^I should see that they have placed (\d+) orders? in the "([^"]+)" channel$/
      */
diff --git a/src/Sylius/Behat/Page/Admin/Customer/ShowPage.php b/src/Sylius/Behat/Page/Admin/Customer/ShowPage.php
@@ -161,60 +161,40 @@ public function hasCustomerPlacedAnyOrders()
         return null !== $this->getElement('statistics')->find('css', '.sylius-orders-overall-count');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getOverallOrdersCount()
-    {
-        $overallOrders = $this
-            ->getElement('statistics')
-            ->find('css', '.sylius-orders-overall-count')
-            ->getText()
-        ;
-
-        return (int) preg_replace('/[^0-9]/', '',$overallOrders);
-    }
-
     /**
      * {@inheritdoc}
      */
     public function getOrdersCountInChannel($channelName)
     {
-        $ordersCountStatistic = $this
+        return (int) $this
             ->getStatisticsForChannel($channelName)
             ->find('css', '.sylius-orders-count')
             ->getText()
         ;
-
-        return (int) $this->getStatisticValue($ordersCountStatistic);
     }
 
     /**
      * {@inheritdoc}
      */
     public function getOrdersTotalInChannel($channelName)
     {
-        $ordersCountStatistic = $this
+        return $this
             ->getStatisticsForChannel($channelName)
             ->find('css', '.sylius-orders-total')
             ->getText()
         ;
-
-        return $this->getStatisticValue($ordersCountStatistic);
     }
 
     /**
      * {@inheritdoc}
      */
     public function getAverageTotalInChannel($channelName)
     {
-        $averageTotalStatistic = $this
+        return $this
             ->getStatisticsForChannel($channelName)
             ->find('css', '.sylius-order-average-total')
             ->getText()
         ;
-
-        return $this->getStatisticValue($averageTotalStatistic);
     }
 
     /**
@@ -263,7 +243,10 @@ protected function getDefinedElements()
      */
     private function getStatisticsForChannel($channelName)
     {
-        $statisticsRibs = $this->getElement('statistics')->findAll('css', '.accordion > .title');
+        $statisticsRibs = $this
+            ->getElement('statistics')
+            ->findAll('css', '.row > .column > .statistic > .sylius-channel-name')
+        ;
 
         $statisticsRibs = array_filter($statisticsRibs, function (NodeElement $statistic) use ($channelName) {
             return $channelName === trim($statistic->getText());
@@ -280,19 +263,9 @@ private function getStatisticsForChannel($channelName)
             )
         );
 
-        $statisticsContents = $this->getElement('statistics')->findAll('css', '.accordion > .content');
+        $statisticsContents = $this->getElement('statistics')->findAll('css', '.row');
         $contentIndexes = array_keys($statisticsRibs);
 
         return $statisticsContents[reset($contentIndexes)];
     }
-
-    /**
-     * @param string $statistic
-     *
-     * @return string
-     */
-    private function getStatisticValue($statistic)
-    {
-        return trim(substr($statistic, strpos($statistic, ':') + 1));
-    }
 }
diff --git a/src/Sylius/Behat/Page/Admin/Customer/ShowPageInterface.php b/src/Sylius/Behat/Page/Admin/Customer/ShowPageInterface.php
@@ -93,11 +93,6 @@ public function impersonate();
      */
     public function hasCustomerPlacedAnyOrders();
 
-    /**
-     * @return int
-     */
-    public function getOverallOrdersCount();
-
     /**
      * @param string $channelName
      *
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Statistics/index.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/Statistics/index.html.twig
@@ -1,6 +1,6 @@
 {% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %}
 
-<div class="ui segment">
+<div class="ui segment" id="statistics">
     {% if statistics.perChannelsStatistics is not empty %}
         <div class="ui center aligned stackable internally celled grid">
             {% for statistic in statistics.perChannelsStatistics %}
