WIP - fixing tests

ivanproskuryakov · Dec 5, 2015 · e8664d1 · e8664d1
1 parent bcd2436
commit e8664d1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/frontend/web/index.html b/frontend/web/index.html
@@ -15,13 +15,11 @@
     <title ng-bind="pageTitle">Aisel - Open Source CMS based on AngularJS and Symfony2</title>
     <meta name="description" ng-attr-content="{{metaDescription}}">
     <meta name="keywords" ng-attr-content="{{metaKeywords}}">
+
     <link rel="stylesheet" href="/bower_components/sass-bootstrap/dist/css/bootstrap.min.css"/>
     <link rel="stylesheet" href="/bower_components/font-awesome/css/font-awesome.min.css"/>
     <link rel="stylesheet" href="/bower_components/angular-loading-bar/build/loading-bar.css"/>
-    <script data-require="prefixfree@*"
-            data-semver="1.0.7"
-            src="//cdnjs.cloudflare.com/ajax/libs/prefixfree/1.0.7/prefixfree.min.js">
-    </script>
+
     <link rel="stylesheet" href="/styles/styles.css">
 </head>
 <body>

diff --git a/frontend/web/index_dev.html b/frontend/web/index_dev.html
@@ -15,13 +15,10 @@
     <title ng-bind="pageTitle">Aisel - Open Source CMS based on AngularJS and Symfony2</title>
     <meta name="description" ng-attr-content="{{metaDescription}}">
     <meta name="keywords" ng-attr-content="{{metaKeywords}}">
+
     <link rel="stylesheet" href="/bower_components/sass-bootstrap/dist/css/bootstrap.min.css"/>
     <link rel="stylesheet" href="/bower_components/font-awesome/css/font-awesome.min.css"/>
     <link rel="stylesheet" href="/bower_components/angular-loading-bar/build/loading-bar.css"/>
-    <script data-require="prefixfree@*"
-            data-semver="1.0.7"
-            src="//cdnjs.cloudflare.com/ajax/libs/prefixfree/1.0.7/prefixfree.min.js">
-    </script>
     <link rel="stylesheet" href="/styles/styles.css">
 
     <script src="/bower_components/gremlins.js/gremlins.min.js"></script>

diff --git a/src/Aisel/AddressingBundle/Tests/SerializerTestCase.php b/src/Aisel/AddressingBundle/Tests/SerializerTestCase.php
@@ -28,7 +28,7 @@ public function testSerializer()
     {
         $country = $this
             ->em
-            ->getRepository(Country::class)
+            ->getRepository('Aisel\AddressingBundle\Entity\Country')
             ->findOneBy(['iso2' => 'RU']);
 
         $obj = ['id' => $country->getId()];
@@ -37,7 +37,7 @@ public function testSerializer()
         $serializer = $this->getContainer()->get('jms_serializer');
         $convertedValue = $serializer->deserialize(
             json_encode($obj),
-            Country::class,
+            'Aisel\AddressingBundle\Entity\Country',
             'json'
         );
 

diff --git a/src/Aisel/PageBundle/Tests/Entity/PageTest.php b/src/Aisel/PageBundle/Tests/Entity/PageTest.php
@@ -15,7 +15,6 @@
 use Faker;
 use Aisel\PageBundle\Entity\Page;
 use Aisel\PageBundle\Entity\Node;
-use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 
 /**
  * PageTests
@@ -37,7 +36,7 @@ protected function tearDown()
 
     public function testDuplicateNodes()
     {
-        $this->setExpectedException(UniqueConstraintViolationException::class);
+        $this->setExpectedException('Doctrine\DBAL\Exception\UniqueConstraintViolationException');
 
         $node = new Node();
         $node->setName($this->faker->title);

diff --git a/src/Aisel/ProductBundle/Tests/Entity/ProductTest.php b/src/Aisel/ProductBundle/Tests/Entity/ProductTest.php
@@ -16,7 +16,6 @@
 use Aisel\ProductBundle\Entity\Product;
 use Aisel\ProductBundle\Entity\Node;
 use Aisel\MediaBundle\Entity\Media;
-use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 
 /**
  * ProductTest
@@ -38,7 +37,7 @@ protected function tearDown()
 
     public function testDuplicateNodes()
     {
-        $this->setExpectedException(UniqueConstraintViolationException::class);
+        $this->setExpectedException('Doctrine\DBAL\Exception\UniqueConstraintViolationException');
 
         $node = new Node();
         $node->setStatus(true);
@@ -70,7 +69,7 @@ public function testDuplicateNodes()
 
     public function testDuplicateImages()
     {
-        $this->setExpectedException(UniqueConstraintViolationException::class);
+        $this->setExpectedException('Doctrine\DBAL\Exception\UniqueConstraintViolationException');
         $image = new Media();
         $image->setType(Media::MEDIA_IMAGE);
         $image->setFilename($this->faker->numberBetween(0, 10000));