Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor RobotsTxt.php to correctly generate the Sitemap URLs by appending a forward slash before each sitemap path. #14

Merged
merged 4 commits into from
Dec 8, 2024
Merged

Refactor RobotsTxt.php to correctly generate the Sitemap URLs by appending a forward slash before each sitemap path. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
318d228
Refactor RobotsTxt.php to correctly generate the Sitemap URLs by appe…
thejmitchener Dec 8, 2024
1004fc7
Fix styling
thejmitchener Dec 8, 2024
6bffb34
Refactor code to include a forward slash before sitemap paths in Robo…
thejmitchener Dec 8, 2024
1687084
Fix if statement syntax in open-ai-pr-description.yml. The changes we…
thejmitchener Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/open-ai-pr-description.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/RobotsTxt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: /";
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/RobotsTxtEnvironmentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
8 changes: 4 additions & 4 deletions tests/Feature/RobotsTxtSitemapTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand All @@ -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);
}
}
Loading