diff --git a/.github/workflows/open-ai-pr-description.yml b/.github/workflows/open-ai-pr-description.yml index f801b1d..eefe69b 100644 --- a/.github/workflows/open-ai-pr-description.yml +++ b/.github/workflows/open-ai-pr-description.yml @@ -15,7 +15,7 @@ jobs: openai-pr-description: runs-on: ubuntu-22.04 # Run the job only if the actor is NOT Dependabot - if: ${{ !startsWith(github.actor, 'dependabot') } + if: ${{ !startsWith(github.actor, 'dependabot') }} steps: - uses: platisd/openai-pr-description@master with: diff --git a/src/RobotsTxt.php b/src/RobotsTxt.php index 876ed21..7e5ba74 100755 --- a/src/RobotsTxt.php +++ b/src/RobotsTxt.php @@ -65,7 +65,7 @@ protected function computeChecksum(): string public function generate(): string { $appEnv = Config::get('app.env'); - $appUrl = Config::get('app.url'); + $appUrl = rtrim(Config::get('app.url'), '/'); if ($appEnv !== 'production') { return "User-agent: *\nDisallow: /"; @@ -88,7 +88,7 @@ public function generate(): string $sitemaps = Config::get('robots-txt.sitemap', []); foreach ($sitemaps as $sitemap) { - $txt .= 'Sitemap: '.$appUrl."$sitemap\n"; + $txt .= 'Sitemap: '.$appUrl.'/'."$sitemap\n"; } return $txt; diff --git a/tests/Feature/RobotsTxtEnvironmentTest.php b/tests/Feature/RobotsTxtEnvironmentTest.php index f773b2c..11bcea0 100644 --- a/tests/Feature/RobotsTxtEnvironmentTest.php +++ b/tests/Feature/RobotsTxtEnvironmentTest.php @@ -76,7 +76,7 @@ public function it_allows_in_production_environment() $sitemaps = config('robots-txt.sitemap'); foreach ($sitemaps as $sitemapPath) { - $response->assertSee('Sitemap: '.($baseUrl).$sitemapPath); + $response->assertSee('Sitemap: '.($baseUrl).'/'.$sitemapPath); } } } diff --git a/tests/Feature/RobotsTxtSitemapTest.php b/tests/Feature/RobotsTxtSitemapTest.php index ef9d33c..591a774 100644 --- a/tests/Feature/RobotsTxtSitemapTest.php +++ b/tests/Feature/RobotsTxtSitemapTest.php @@ -25,7 +25,7 @@ public function it_includes_a_singular_sitemap_in_robots_txt(): void $baseUrl = config('app.url'); - $this->assertStringContainsString('Sitemap: '.$baseUrl.'sitemap.xml', $robotsContent); + $this->assertStringContainsString('Sitemap: '.$baseUrl.'/'.'sitemap.xml', $robotsContent); } /** @@ -48,8 +48,8 @@ public function it_includes_multiple_sitemaps_in_robots_txt(): void $baseUrl = config('app.url'); - $this->assertStringContainsString('Sitemap: '.$baseUrl.'sitemap.xml', $robotsContent); - $this->assertStringContainsString('Sitemap: '.$baseUrl.'sitemap_pages.xml', $robotsContent); - $this->assertStringContainsString('Sitemap: '.$baseUrl.'sitemap_posts.xml', $robotsContent); + $this->assertStringContainsString('Sitemap: '.$baseUrl.'/'.'sitemap.xml', $robotsContent); + $this->assertStringContainsString('Sitemap: '.$baseUrl.'/'.'sitemap_pages.xml', $robotsContent); + $this->assertStringContainsString('Sitemap: '.$baseUrl.'/'.'sitemap_posts.xml', $robotsContent); } }