- @foreach (resolve('articles') as $article)
+ @foreach ($articles as $article)
{{ $article->title }}
diff --git a/tests/Article/ArticlePublishingTest.php b/tests/Article/ArticlePublishingTest.php
new file mode 100644
index 00000000..e91ac1dc
--- /dev/null
+++ b/tests/Article/ArticlePublishingTest.php
@@ -0,0 +1,62 @@
+create(['publish_date' => Carbon::tomorrow()]);
+
+ $this->assertCount(0, Article::all());
+ }
+
+ /**
+ * @test
+ */
+ public function it_should_show_articles_published_today()
+ {
+ factory('App\Model\Article')->create(['publish_date' => Carbon::today()]);
+
+ $this->assertCount(1, Article::all());
+ }
+
+ /**
+ * @test
+ */
+ public function it_should_not_show_articles_with_unpublish_date_less_than_today()
+ {
+ factory('App\Model\Article')->create(['publish_date' => Carbon::yesterday(), 'unpublish_date' => Carbon::today()]);
+
+ $this->assertCount(0, Article::all());
+ }
+
+ /**
+ * @test
+ */
+ public function it_should_show_articles_with_unpublish_date_tommorow()
+ {
+ factory('App\Model\Article')->create(['publish_date' => Carbon::now(), 'unpublish_date' => Carbon::tomorrow()]);
+
+ $this->assertCount(1, Article::all());
+ }
+}
diff --git a/tests/Article/ArticleViewingTest.php b/tests/Article/ArticleResponseTest.php
similarity index 65%
rename from tests/Article/ArticleViewingTest.php
rename to tests/Article/ArticleResponseTest.php
index 13a08cfe..c5c25e8f 100644
--- a/tests/Article/ArticleViewingTest.php
+++ b/tests/Article/ArticleResponseTest.php
@@ -2,13 +2,14 @@
namespace Tests\Article;
+use Carbon\Carbon;
use Tests\TestCase;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Route;
use Illuminate\Foundation\Testing\WithFaker;
use Illuminate\Foundation\Testing\RefreshDatabase;
-class ArticleViewingTest extends TestCase
+class ArticleResponseTest extends TestCase
{
/*
* Provide fake content
@@ -53,7 +54,7 @@ public function an_articles_views_are_incremented_after_being_viewed()
/**
* @test
*/
- public function a_single_article_can_be_viewed_on_the_frontpage()
+ public function it_should_show_an_article_that_is_published()
{
$article = factory('App\Model\Article')->create(['views' => 0]);
@@ -62,30 +63,46 @@ public function a_single_article_can_be_viewed_on_the_frontpage()
$response->assertSee($article->title)->assertViewIs('articles')->assertOk();
}
+ /**
+ * @test
+ */
+ public function it_should_not_show_an_article_that_is_not_published()
+ {
+ $this->withExceptionHandling();
+
+ $article = factory('App\Model\Article')->create(['views' => 0, 'publish_date' => Carbon::yesterday(), 'unpublish_date' => Carbon::now()]);
+
+ $response = $this->get($article->path());
+
+ $response->assertStatus(404);
+ }
+
/**
* @test
* t */
- public function a_collection_of_articles_can_be_viewed_on_the_frontpage()
+ public function a_collection_of_articles_can_be_viewed_on_the_frontpage_except_unpublished()
{
$collection = factory('App\Model\Article', 5)->create();
+ $unpublished = factory('App\Model\Article')->create(['unpublish_date' => Carbon::now()]);
$response = $this->get('articles');
- $response->assertSee($collection->random()->title)->assertViewIs('articles')->assertOk();
+ $response->assertSee($collection->random()->title)->assertDontSee($unpublished->title)->assertViewIs('articles')->assertOk();
}
/**
* @test
*/
- public function a_category_can_have_a_collection_of_articles_on_the_frontpage()
+ public function a_category_can_have_a_collection_of_articles_on_the_frontpage_except_unpublished()
{
$category = factory('App\Model\Categories')->create();
+ $unpublished = factory('App\Model\Article')->create(['unpublish_date' => Carbon::now()]);
$collection = factory('App\Model\Article', 5)->create(['category_id' => $category->id]);
$response = $this->get('articles/'.$category->slug);
- $response->assertSee($collection->random()->title)->assertViewIs('articles')->assertOk();
+ $response->assertSee($collection->random()->title)->assertDontSee($unpublished->title)->assertViewIs('articles')->assertOk();
}
/**
@@ -105,14 +122,27 @@ public function articles_can_be_searched_on_the_frontpage()
/**
* @test
*/
- public function view_all_articles_by_creator_on_the_frontpage()
+ public function it_should_not_show_unpublished_articles_on_search()
+ {
+ $unpublished = factory('App\Model\Article')->create(['unpublish_date' => Carbon::now()]);
+
+ $response = $this->get('/articles/search?query='.$unpublished->title);
+
+ $response->assertDontSee($unpublished->title)->assertViewIs('articles')->assertOk();
+ }
+
+ /**
+ * @test
+ */
+ public function view_all_articles_by_creator_on_the_frontpage_except_unpublished()
{
$account = factory('App\Model\Account')->create();
$articles = factory('App\Model\Article', 3)->create(['creator_id' => $account->id]);
+ $unpublished = factory('App\Model\Article')->create(['unpublish_date' => Carbon::now()]);
$response = $this->get('/articles/creator/'.$account->username);
- $response->assertSee($articles->random()->title)->assertViewIs('articles')->assertOk();
+ $response->assertSee($articles->random()->title)->assertDontSee($unpublished->title)->assertViewIs('articles')->assertOk();
}
}
diff --git a/tests/Common/BreadcrumbsTest.php b/tests/Common/BreadcrumbsTest.php
index 4cee8069..a7037fd6 100644
--- a/tests/Common/BreadcrumbsTest.php
+++ b/tests/Common/BreadcrumbsTest.php
@@ -88,7 +88,7 @@ public function testFromCurrentRoute()
$this->call('GET', '/breadcrumb/test');
- $this->assertCount(4, Breadcrumbs::fromCurrentRoute()->crumbs());
+ $this->assertCount(3, Breadcrumbs::fromCurrentRoute()->crumbs());
}
// @todo: Check the array for the correct return string.?
diff --git a/tests/Module/ModuleManagerTest.php b/tests/Module/ModuleManagerTest.php
index 6a9ba981..e18c77e9 100644
--- a/tests/Module/ModuleManagerTest.php
+++ b/tests/Module/ModuleManagerTest.php
@@ -8,6 +8,7 @@
use App\Modules\ModuleManager;
use App\Modules\ModuleRepository;
use Illuminate\Support\Facades\Config;
+use App\Modules\ModuleNotFoundException;
use App\Modules\Pages\Model\PageOptions;
use Illuminate\Foundation\Testing\RefreshDatabase;
diff --git a/tests/Products/ProductInstallationTest.php b/tests/Products/ProductInstallationTest.php
index 8548ac0d..477064e7 100644
--- a/tests/Products/ProductInstallationTest.php
+++ b/tests/Products/ProductInstallationTest.php
@@ -20,12 +20,14 @@ class ProductInstallationTest extends TestCase
*/
public function modules_can_be_toggled()
{
+ $this->signIn();
+
$mocked = Mockery::mock(ModuleManager::class)->shouldReceive('toggle')->andReturn(true)->getMock();
$this->app->instance(ModuleManager::class, $mocked);
$response = $this->get('/admin/products/test/toggle');
- $response->assertRedirect('/admin/products')->assertSee('test');
+ $response->assertRedirect('/admin/products');
}
}
diff --git a/tests/Sitemap/SitemapGeneratorTest.php b/tests/Sitemap/SitemapGeneratorTest.php
new file mode 100644
index 00000000..082706bc
--- /dev/null
+++ b/tests/Sitemap/SitemapGeneratorTest.php
@@ -0,0 +1,89 @@
+generator = new SitemapGenerator(new Collection);
+ }
+
+ /**
+ * @test
+ */
+ public function it_should_add_urls()
+ {
+ $this->generator->add($this->faker->url);
+
+ $this->assertCount(1, $this->generator->collection());
+ }
+
+ /**
+ * @test
+ */
+ public function it_should_add_multiple_urls()
+ {
+ $this->generator->add($this->faker->url);
+ $this->generator->add($this->faker->url);
+
+ $this->assertCount(2, $this->generator->collection());
+ }
+
+ /**
+ * @test
+ */
+ public function it_can_have_a_last_modified_date()
+ {
+ $this->generator->add($this->faker->url)->modified(Carbon::create(2018, 7, 7));
+
+ $this->assertTrue(array_has($this->generator->collection(), '0.loc'));
+ }
+
+ /**
+ * @test
+ */
+ public function it_can_have_a_change_frequency()
+ {
+ $this->generator->add($this->faker->url)->withFrequency(Sitemap::FREQUENCY_DAILY);
+
+ $this->assertTrue(array_has($this->generator->collection(), '0.changefreq'));
+ }
+
+ /**
+ * @test
+ */
+ public function it_can_have_a_priority()
+ {
+ $this->generator->add($this->faker->url)->andPriority(Sitemap::PRIORITY_HIGHEST);
+
+ $this->assertTrue(array_has($this->generator->collection(), '0.priority'));
+ }
+}
diff --git a/tests/Sitemap/SitemapResponseTest.php b/tests/Sitemap/SitemapResponseTest.php
new file mode 100644
index 00000000..4fe08fc9
--- /dev/null
+++ b/tests/Sitemap/SitemapResponseTest.php
@@ -0,0 +1,57 @@
+get('/sitemap.xml')->assertHeader('Content-type', 'text/xml; charset=UTF-8')->assertOk();
+ }
+
+ /**
+ * @test
+ */
+ public function it_shows_pages_on_sitemap()
+ {
+ $page = factory('App\Model\Page')->create(['option' => PageOptions::OPTION_SITEMAP]);
+
+ $response = $this->get('/sitemap.xml');
+
+ $response->assertSee(''.$page->path().'');
+ $response->assertSee(''.$page->updated_at->format('Y-m-d').'');
+
+ $this->assertCount(2, $response->getOriginalContent()->getData()['urlset']);
+ }
+
+ /**
+ * @test
+ */
+ public function it_shows_articles_on_sitemap_except_unpublished()
+ {
+ $collection = factory('App\Model\Article', 2)->create(['status' => true]);
+ $unpublished = factory('App\Model\Article')->create(['unpublish_date' => Carbon::now()]);
+
+ $response = $this->get('/sitemap.xml');
+
+ $this->assertCount(3, $response->getOriginalContent()->getData()['urlset']);
+
+ $response->assertSee($collection->random()->path())->assertDontSee($unpublished->path());
+ }
+}