Add latest changes from gitlab-org/gitlab@master

7 files changed, 16 insertions, 16 deletions

diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb
index acc6935cb71..126bb1c9822 100644
--- a/spec/controllers/projects/artifacts_controller_spec.rb
+++ b/spec/controllers/projects/artifacts_controller_spec.rb
@@ -97,7 +97,7 @@ describe Projects::ArtifactsController do
     it 'sets the notice' do
       subject
 
-      expect(flash[:notice]).to eq('Artifact was successfully deleted.')
+      expect(flash[:notice]).to eq(_('Artifact was successfully deleted.'))
     end
 
     context 'when artifact deletion fails' do
@@ -114,7 +114,7 @@ describe Projects::ArtifactsController do
       it 'sets the notice' do
         subject
 
-        expect(flash[:notice]).to eq('Artifact could not be deleted.')
+        expect(flash[:notice]).to eq(_('Artifact could not be deleted.'))
       end
     end
 
diff --git a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
index b8cf47cb1f2..0940fccb431 100644
--- a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
+++ b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
@@ -86,8 +86,8 @@ describe Projects::Environments::PrometheusApiController do
         it 'returns 204 no_content' do
           get :proxy, params: environment_params
 
-          expect(json_response['status']).to eq('processing')
-          expect(json_response['message']).to eq('Not ready yet. Try again later.')
+          expect(json_response['status']).to eq(_('processing'))
+          expect(json_response['message']).to eq(_('Not ready yet. Try again later.'))
           expect(response).to have_gitlab_http_status(:no_content)
         end
       end
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 29746bbd863..51d5a0d2144 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -170,7 +170,7 @@ describe Projects::IssuesController do
     it 'redirects to signin if not logged in' do
       get :new, params: { namespace_id: project.namespace, project_id: project }
 
-      expect(flash[:alert]).to eq 'You need to sign in or sign up before continuing.'
+      expect(flash[:alert]).to eq I18n.t('devise.failure.unauthenticated')
       expect(response).to redirect_to(new_user_session_path)
     end
 
@@ -926,7 +926,7 @@ describe Projects::IssuesController do
       it 'sets a flash message' do
         post_issue(title: 'Hello')
 
-        expect(flash[:notice]).to eq('Resolved all discussions.')
+        expect(flash[:notice]).to eq(_('Resolved all discussions.'))
       end
 
       describe "resolving a single discussion" do
@@ -940,7 +940,7 @@ describe Projects::IssuesController do
         end
 
         it 'sets a flash message that one discussion was resolved' do
-          expect(flash[:notice]).to eq('Resolved 1 discussion.')
+          expect(flash[:notice]).to eq(_('Resolved 1 discussion.'))
         end
       end
     end
@@ -1314,7 +1314,7 @@ describe Projects::IssuesController do
       it "returns 302 for project members with developer role" do
         import_csv
 
-        expect(flash[:notice]).to include('Your issues are being imported')
+        expect(flash[:notice]).to eq(_("Your issues are being imported. Once finished, you'll get a confirmation email."))
         expect(response).to redirect_to(project_issues_path(project))
       end
 
@@ -1325,7 +1325,7 @@ describe Projects::IssuesController do
 
         import_csv
 
-        expect(flash[:alert]).to include('File upload error.')
+        expect(flash[:alert]).to include(_('File upload error.'))
         expect(response).to redirect_to(project_issues_path(project))
       end
     end
diff --git a/spec/controllers/projects/pipeline_schedules_controller_spec.rb b/spec/controllers/projects/pipeline_schedules_controller_spec.rb
index 63e2c8a339c..60b802f1cab 100644
--- a/spec/controllers/projects/pipeline_schedules_controller_spec.rb
+++ b/spec/controllers/projects/pipeline_schedules_controller_spec.rb
@@ -416,7 +416,7 @@ describe Projects::PipelineSchedulesController do
         end
 
         expect(flash.to_a.size).to eq(2)
-        expect(flash[:alert]).to eq 'You cannot play this scheduled pipeline at the moment. Please wait a minute.'
+        expect(flash[:alert]).to eq _('You cannot play this scheduled pipeline at the moment. Please wait a minute.')
         expect(response).to have_gitlab_http_status(302)
       end
     end
diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index ebc22043891..bdf1c1a84d3 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -59,7 +59,7 @@ describe Projects::RawController do
       it 'prevents from accessing the raw file' do
         execute_raw_requests(requests: 6, project: project, file_path: file_path)
 
-        expect(flash[:alert]).to eq('You cannot access the raw file. Please wait a minute.')
+        expect(flash[:alert]).to eq(_('You cannot access the raw file. Please wait a minute.'))
         expect(response).to have_gitlab_http_status(429)
       end
 
@@ -109,7 +109,7 @@ describe Projects::RawController do
 
           execute_raw_requests(requests: 3, project: project, file_path: modified_path)
 
-          expect(flash[:alert]).to eq('You cannot access the raw file. Please wait a minute.')
+          expect(flash[:alert]).to eq(_('You cannot access the raw file. Please wait a minute.'))
           expect(response).to have_gitlab_http_status(429)
         end
       end
@@ -137,7 +137,7 @@ describe Projects::RawController do
           # Accessing downcase version of readme
           execute_raw_requests(requests: 6, project: project, file_path: file_path)
 
-          expect(flash[:alert]).to eq('You cannot access the raw file. Please wait a minute.')
+          expect(flash[:alert]).to eq(_('You cannot access the raw file. Please wait a minute.'))
           expect(response).to have_gitlab_http_status(429)
 
           # Accessing upcase version of readme
diff --git a/spec/controllers/projects/uploads_controller_spec.rb b/spec/controllers/projects/uploads_controller_spec.rb
index 661ed9840b1..cd6a9886f72 100644
--- a/spec/controllers/projects/uploads_controller_spec.rb
+++ b/spec/controllers/projects/uploads_controller_spec.rb
@@ -35,7 +35,7 @@ describe Projects::UploadsController do
       post_authorize
 
       expect(response).to have_gitlab_http_status(500)
-      expect(response.body).to eq('Error uploading file')
+      expect(response.body).to eq(_('Error uploading file'))
     end
   end
 
diff --git a/spec/controllers/projects/wikis_controller_spec.rb b/spec/controllers/projects/wikis_controller_spec.rb
index f46da908218..3100aa2cb96 100644
--- a/spec/controllers/projects/wikis_controller_spec.rb
+++ b/spec/controllers/projects/wikis_controller_spec.rb
@@ -114,7 +114,7 @@ describe Projects::WikisController do
           subject
 
           expect(response).to have_http_status(:ok)
-          expect(flash[:notice]).to eq('The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.')
+          expect(flash[:notice]).to eq(_('The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.'))
         end
       end
     end
@@ -205,7 +205,7 @@ describe Projects::WikisController do
         subject
 
         expect(response).to have_http_status(:ok)
-        expect(response.body).to include('Edit Page')
+        expect(response.body).to include(s_('Wiki|Edit Page'))
       end
     end
   end