From 90d74c609e9c57dff74b486e492f055c5de3f7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 4 Jul 2017 21:43:01 +0200 Subject: [PATCH] fix css classes in tests --- {Tests => Resources/test}/Fixtures/.DS_Store | Bin .../test}/Fixtures/App/app/AppKernel.php | 0 .../Fixtures/App/app/DoctrineMigrations/.gitignore | 0 .../test}/Fixtures/App/app/config/config.yml | 0 .../test}/Fixtures/App/app/config/config_dev.yml | 0 .../test}/Fixtures/App/app/config/config_test.yml | 0 .../App/app/config/parameters.gitlab-ci.yml | 0 .../Fixtures/App/app/config/parameters.yml.dist | 0 .../test}/Fixtures/App/app/config/routing.yml | 0 {Tests => Resources/test}/Fixtures/App/app/console | 0 .../test}/Fixtures/App/web/.gitignore | 0 .../views/Timeline/report_person_context.html.twig | 2 +- Tests/Search/ReportSearchTest.php | 1 - Tests/Timeline/TimelineProviderTest.php | 8 ++++---- 14 files changed, 5 insertions(+), 6 deletions(-) rename {Tests => Resources/test}/Fixtures/.DS_Store (100%) rename {Tests => Resources/test}/Fixtures/App/app/AppKernel.php (100%) rename {Tests => Resources/test}/Fixtures/App/app/DoctrineMigrations/.gitignore (100%) rename {Tests => Resources/test}/Fixtures/App/app/config/config.yml (100%) rename {Tests => Resources/test}/Fixtures/App/app/config/config_dev.yml (100%) rename {Tests => Resources/test}/Fixtures/App/app/config/config_test.yml (100%) rename {Tests => Resources/test}/Fixtures/App/app/config/parameters.gitlab-ci.yml (100%) rename {Tests => Resources/test}/Fixtures/App/app/config/parameters.yml.dist (100%) rename {Tests => Resources/test}/Fixtures/App/app/config/routing.yml (100%) rename {Tests => Resources/test}/Fixtures/App/app/console (100%) rename {Tests => Resources/test}/Fixtures/App/web/.gitignore (100%) diff --git a/Tests/Fixtures/.DS_Store b/Resources/test/Fixtures/.DS_Store similarity index 100% rename from Tests/Fixtures/.DS_Store rename to Resources/test/Fixtures/.DS_Store diff --git a/Tests/Fixtures/App/app/AppKernel.php b/Resources/test/Fixtures/App/app/AppKernel.php similarity index 100% rename from Tests/Fixtures/App/app/AppKernel.php rename to Resources/test/Fixtures/App/app/AppKernel.php diff --git a/Tests/Fixtures/App/app/DoctrineMigrations/.gitignore b/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore similarity index 100% rename from Tests/Fixtures/App/app/DoctrineMigrations/.gitignore rename to Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore diff --git a/Tests/Fixtures/App/app/config/config.yml b/Resources/test/Fixtures/App/app/config/config.yml similarity index 100% rename from Tests/Fixtures/App/app/config/config.yml rename to Resources/test/Fixtures/App/app/config/config.yml diff --git a/Tests/Fixtures/App/app/config/config_dev.yml b/Resources/test/Fixtures/App/app/config/config_dev.yml similarity index 100% rename from Tests/Fixtures/App/app/config/config_dev.yml rename to Resources/test/Fixtures/App/app/config/config_dev.yml diff --git a/Tests/Fixtures/App/app/config/config_test.yml b/Resources/test/Fixtures/App/app/config/config_test.yml similarity index 100% rename from Tests/Fixtures/App/app/config/config_test.yml rename to Resources/test/Fixtures/App/app/config/config_test.yml diff --git a/Tests/Fixtures/App/app/config/parameters.gitlab-ci.yml b/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml similarity index 100% rename from Tests/Fixtures/App/app/config/parameters.gitlab-ci.yml rename to Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml diff --git a/Tests/Fixtures/App/app/config/parameters.yml.dist b/Resources/test/Fixtures/App/app/config/parameters.yml.dist similarity index 100% rename from Tests/Fixtures/App/app/config/parameters.yml.dist rename to Resources/test/Fixtures/App/app/config/parameters.yml.dist diff --git a/Tests/Fixtures/App/app/config/routing.yml b/Resources/test/Fixtures/App/app/config/routing.yml similarity index 100% rename from Tests/Fixtures/App/app/config/routing.yml rename to Resources/test/Fixtures/App/app/config/routing.yml diff --git a/Tests/Fixtures/App/app/console b/Resources/test/Fixtures/App/app/console similarity index 100% rename from Tests/Fixtures/App/app/console rename to Resources/test/Fixtures/App/app/console diff --git a/Tests/Fixtures/App/web/.gitignore b/Resources/test/Fixtures/App/web/.gitignore similarity index 100% rename from Tests/Fixtures/App/web/.gitignore rename to Resources/test/Fixtures/App/web/.gitignore diff --git a/Resources/views/Timeline/report_person_context.html.twig b/Resources/views/Timeline/report_person_context.html.twig index e2f64224e..c7b4e5b3f 100644 --- a/Resources/views/Timeline/report_person_context.html.twig +++ b/Resources/views/Timeline/report_person_context.html.twig @@ -1,4 +1,4 @@ -
+

{{ report.date|localizeddate('long', 'none') }} / {{ 'Report'|trans }}

{{ '%user% has filled a %report_label% report on %date%'|trans( diff --git a/Tests/Search/ReportSearchTest.php b/Tests/Search/ReportSearchTest.php index b650c7cea..d4fc0e757 100644 --- a/Tests/Search/ReportSearchTest.php +++ b/Tests/Search/ReportSearchTest.php @@ -64,7 +64,6 @@ class ReportSearchTest extends WebTestCase )); $this->assertTrue($client->getResponse()->isSuccessful()); - $this->assertRegExp('/Charline/', $crawler->text()); $this->assertRegExp('/Situation de logement/i', $crawler->text()); } diff --git a/Tests/Timeline/TimelineProviderTest.php b/Tests/Timeline/TimelineProviderTest.php index 5df8e22fd..830600a6e 100644 --- a/Tests/Timeline/TimelineProviderTest.php +++ b/Tests/Timeline/TimelineProviderTest.php @@ -130,13 +130,13 @@ class TimelineProviderTest extends WebTestCase //performs tests $this->assertTrue($client->getResponse()->isSuccessful(), 'The page timeline is loaded successfully'); - $this->assertGreaterThan(0, $crawler->filter('.report .summary') + $this->assertGreaterThan(0, $crawler->filter('.report_entry .summary') ->count(), 'the page contains a .report .summary element'); - $this->assertContains('blah blah', $crawler->filter('.report .summary') + $this->assertContains('blah blah', $crawler->filter('.report_entry .summary') ->text(), 'the page contains the text "blah blah"'); - $this->assertContains('Propriétaire', $crawler->filter('.report .summary') + $this->assertContains('Propriétaire', $crawler->filter('.report_entry .summary') ->text(), 'the page contains the mention "Propriétaire"'); } @@ -150,7 +150,7 @@ class TimelineProviderTest extends WebTestCase $crawler = $client->request('GET', '/fr/person/'.$this->person->getId() .'/timeline'); - $this->assertEquals(0, $crawler->filter('.report .summary') + $this->assertEquals(0, $crawler->filter('.report_entry .summary') ->count(), 'the page does not contains a .report .summary element'); }