Skip to content

Commit

Permalink
Merge pull request #1499 from cyberark/75-status-title-regression
Browse files Browse the repository at this point in the history
Fix status page title regression
  • Loading branch information
micahlee authored Apr 20, 2020
2 parents 667571c + 0b76c61 commit 8130131
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## Unreleased

### Fixed
- Title of status page is now `Conjur Status` again, rather than only
`Conjur` ([conjurinc/dap-support](https://github.com/conjurinc/dap-support/issues/75)).

## [1.6.0] - 2020-04-14

### Changed
Expand Down
2 changes: 1 addition & 1 deletion app/views/status/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width">

<link rel="stylesheet" href="/css/status-page.css">
<title>Conjur</title>
<title>Conjur Status</title>
</head>
<body>

Expand Down
12 changes: 12 additions & 0 deletions spec/views/status_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
require 'spec_helper'

RSpec.describe "status/index" do
# The title text, 'Conjur Status', is a well-known
# string that Conjur health probes are configured to
# inspect the response for.
it "includes the text 'Conjur Status'" do
render

expect(rendered).to include 'Conjur Status'
end
end

0 comments on commit 8130131

Please sign in to comment.