summaryrefslogtreecommitdiff
path: root/spec/requests/api
diff options
context:
space:
mode:
Diffstat (limited to 'spec/requests/api')
-rw-r--r--spec/requests/api/files_spec.rb2
-rw-r--r--spec/requests/api/helpers_spec.rb4
-rw-r--r--spec/requests/api/issues_spec.rb4
-rw-r--r--spec/requests/api/markdown_spec.rb10
-rw-r--r--spec/requests/api/releases_spec.rb4
-rw-r--r--spec/requests/api/settings_spec.rb4
-rw-r--r--spec/requests/api/tags_spec.rb8
7 files changed, 18 insertions, 18 deletions
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb
index 9b32dc78274..616c3d87028 100644
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
@@ -472,7 +472,7 @@ describe API::Files do
put api(route(file_path), user), params: params_with_stale_id
expect(response).to have_gitlab_http_status(400)
- expect(json_response['message']).to eq('You are attempting to update a file that has changed since you started editing it.')
+ expect(json_response['message']).to eq(_('You are attempting to update a file that has changed since you started editing it.'))
end
it "updates existing file in project repo with accepts correct last commit id" do
diff --git a/spec/requests/api/helpers_spec.rb b/spec/requests/api/helpers_spec.rb
index a0c64d295c0..0cf1e754d87 100644
--- a/spec/requests/api/helpers_spec.rb
+++ b/spec/requests/api/helpers_spec.rb
@@ -264,7 +264,7 @@ describe API::Helpers do
# We need to stub at a lower level than #sentry_enabled? otherwise
# Sentry is not enabled when the request below is made, and the test
# would pass even without the fix
- expect(ProjectsFinder).to receive(:new).and_raise('Runtime Error!')
+ expect(ProjectsFinder).to receive(:new).and_raise(_('Runtime Error!'))
get api('/projects', personal_access_token: token)
@@ -281,7 +281,7 @@ describe API::Helpers do
let(:event_data) { Raven.client.transport.events.first[1] }
it 'sends the params, excluding confidential values' do
- expect(ProjectsFinder).to receive(:new).and_raise('Runtime Error!')
+ expect(ProjectsFinder).to receive(:new).and_raise(_('Runtime Error!'))
get api('/projects', user), params: { password: 'dont_send_this', other_param: 'send_this' }
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index ba7930f6c9d..6b478451f7d 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -1588,7 +1588,7 @@ describe API::Issues do
params: { to_project_id: project.id }
expect(response).to have_gitlab_http_status(400)
- expect(json_response['message']).to eq('Cannot move issue to project it originates from!')
+ expect(json_response['message']).to eq(_('Cannot move issue to project it originates from!'))
end
end
@@ -1598,7 +1598,7 @@ describe API::Issues do
params: { to_project_id: target_project2.id }
expect(response).to have_gitlab_http_status(400)
- expect(json_response['message']).to eq('Cannot move issue due to insufficient permissions!')
+ expect(json_response['message']).to eq(_('Cannot move issue due to insufficient permissions!'))
end
end
diff --git a/spec/requests/api/markdown_spec.rb b/spec/requests/api/markdown_spec.rb
index e82ef002d32..3f73f0054e8 100644
--- a/spec/requests/api/markdown_spec.rb
+++ b/spec/requests/api/markdown_spec.rb
@@ -41,7 +41,7 @@ describe API::Markdown do
end
context "when project is not found" do
- let(:params) { { text: "Hello world!", gfm: true, project: "Dummy project" } }
+ let(:params) { { text: _("Hello world!"), gfm: true, project: "Dummy project" } }
it_behaves_like "404 Project Not Found"
end
@@ -82,7 +82,7 @@ describe API::Markdown do
expect(response).to have_http_status(201)
expect(response.headers["Content-Type"]).to eq("application/json")
expect(json_response).to be_a(Hash)
- expect(json_response["html"]).to include("Hello world!")
+ expect(json_response["html"]).to include(_("Hello world!"))
.and include('data-name="tada"')
.and include('data-name="100"')
.and include("#1")
@@ -99,7 +99,7 @@ describe API::Markdown do
expect(response).to have_http_status(201)
expect(response.headers["Content-Type"]).to eq("application/json")
expect(json_response).to be_a(Hash)
- expect(json_response["html"]).to include("Hello world!")
+ expect(json_response["html"]).to include(_("Hello world!"))
.and include('data-name="tada"')
.and include('data-name="100"')
.and include("<a href=\"#{IssuesHelper.url_for_issue(issue.iid, project)}\"")
@@ -119,7 +119,7 @@ describe API::Markdown do
expect(response).to have_http_status(201)
expect(json_response["html"]).not_to include('Confidential title')
expect(json_response["html"]).not_to include('<a href=')
- expect(json_response["html"]).to include('Hello world!')
+ expect(json_response["html"]).to include(_('Hello world!'))
.and include('data-name="tada"')
.and include('data-name="100"')
.and include('#1</p>')
@@ -144,7 +144,7 @@ describe API::Markdown do
it 'renders the title or link' do
expect(response).to have_http_status(201)
expect(json_response["html"]).to include('Confidential title')
- expect(json_response["html"]).to include('Hello world!')
+ expect(json_response["html"]).to include(_('Hello world!'))
.and include('data-name="tada"')
.and include('data-name="100"')
.and include("<a href=\"#{IssuesHelper.url_for_issue(confidential_issue.iid, public_project)}\"")
diff --git a/spec/requests/api/releases_spec.rb b/spec/requests/api/releases_spec.rb
index 811e23fb854..1b8d59feecf 100644
--- a/spec/requests/api/releases_spec.rb
+++ b/spec/requests/api/releases_spec.rb
@@ -437,7 +437,7 @@ describe API::Releases do
end
describe 'PUT /projects/:id/releases/:tag_name' do
- let(:params) { { description: 'Best release ever!' } }
+ let(:params) { { description: _('Best release ever!') } }
let!(:release) do
create(:release,
@@ -456,7 +456,7 @@ describe API::Releases do
it 'updates the description' do
put api("/projects/#{project.id}/releases/v0.1", maintainer), params: params
- expect(project.releases.last.description).to eq('Best release ever!')
+ expect(project.releases.last.description).to eq(_('Best release ever!'))
end
it 'does not change other attributes' do
diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb
index 45fb1562e84..9a7249ac136 100644
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
@@ -60,7 +60,7 @@ describe API::Settings, 'Settings' do
ecdsa_key_restriction: 384,
ed25519_key_restriction: 256,
enforce_terms: true,
- terms: 'Hello world!',
+ terms: _('Hello world!'),
performance_bar_allowed_group_path: group.full_path,
instance_statistics_visibility_private: true,
diff_max_patch_bytes: 150_000,
@@ -85,7 +85,7 @@ describe API::Settings, 'Settings' do
expect(json_response['ecdsa_key_restriction']).to eq(384)
expect(json_response['ed25519_key_restriction']).to eq(256)
expect(json_response['enforce_terms']).to be(true)
- expect(json_response['terms']).to eq('Hello world!')
+ expect(json_response['terms']).to eq(_('Hello world!'))
expect(json_response['performance_bar_allowed_group_id']).to eq(group.id)
expect(json_response['instance_statistics_visibility_private']).to be(true)
expect(json_response['diff_max_patch_bytes']).to eq(150_000)
diff --git a/spec/requests/api/tags_spec.rb b/spec/requests/api/tags_spec.rb
index fffe878ddbd..63431d78fc9 100644
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
@@ -117,7 +117,7 @@ describe API::Tags do
end
context 'with releases' do
- let(:description) { 'Awesome release!' }
+ let(:description) { _('Awesome release!') }
let!(:release) do
create(:release,
@@ -371,7 +371,7 @@ describe API::Tags do
describe 'POST /projects/:id/repository/tags/:tag_name/release' do
let(:route) { "/projects/#{project_id}/repository/tags/#{tag_name}/release" }
- let(:description) { 'Awesome release!' }
+ let(:description) { _('Awesome release!') }
shared_examples_for 'repository new release' do
it 'creates description for existing git tag' do
@@ -427,8 +427,8 @@ describe API::Tags do
describe 'PUT id/repository/tags/:tag_name/release' do
let(:route) { "/projects/#{project_id}/repository/tags/#{tag_name}/release" }
- let(:description) { 'Awesome release!' }
- let(:new_description) { 'The best release!' }
+ let(:description) { _('Awesome release!') }
+ let(:new_description) { _('The best release!') }
shared_examples_for 'repository update release' do
context 'on tag with existing release' do
View Lorry Controller Status