Fix tests.
This commit is contained in:
parent
5f93b0e3da
commit
1d829ca151
4 changed files with 12 additions and 12 deletions
|
@ -74,7 +74,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I fill the new file name with an illegal name' do
|
||||
fill_in :file_name, with: '.git'
|
||||
fill_in :file_name, with: 'Spaces Not Allowed'
|
||||
end
|
||||
|
||||
step 'I fill the commit message' do
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Gitlab::Regex do
|
||||
describe 'path regex' do
|
||||
it { expect('gitlab-ce').to match(Gitlab::Regex.path_regex) }
|
||||
it { expect('gitlab_git').to match(Gitlab::Regex.path_regex) }
|
||||
it { expect('_underscore.js').to match(Gitlab::Regex.path_regex) }
|
||||
it { expect('100px.com').to match(Gitlab::Regex.path_regex) }
|
||||
it { expect('?gitlab').not_to match(Gitlab::Regex.path_regex) }
|
||||
it { expect('git lab').not_to match(Gitlab::Regex.path_regex) }
|
||||
it { expect('gitlab.git').not_to match(Gitlab::Regex.path_regex) }
|
||||
describe 'project path regex' do
|
||||
it { expect('gitlab-ce').to match(Gitlab::Regex.project_path_regex) }
|
||||
it { expect('gitlab_git').to match(Gitlab::Regex.project_path_regex) }
|
||||
it { expect('_underscore.js').to match(Gitlab::Regex.project_path_regex) }
|
||||
it { expect('100px.com').to match(Gitlab::Regex.project_path_regex) }
|
||||
it { expect('?gitlab').not_to match(Gitlab::Regex.project_path_regex) }
|
||||
it { expect('git lab').not_to match(Gitlab::Regex.project_path_regex) }
|
||||
it { expect('gitlab.git').not_to match(Gitlab::Regex.project_path_regex) }
|
||||
end
|
||||
|
||||
describe 'project name regex' do
|
||||
|
|
|
@ -252,7 +252,7 @@ describe API::API, api: true do
|
|||
expect(json_response['message']['path']).to eq([
|
||||
'can\'t be blank',
|
||||
'is too short (minimum is 0 characters)',
|
||||
Gitlab::Regex.send(:default_regex_message)
|
||||
Gitlab::Regex.send(:project_path_regex_message)
|
||||
])
|
||||
end
|
||||
|
||||
|
|
|
@ -140,7 +140,7 @@ describe API::API, api: true do
|
|||
expect(json_response['message']['projects_limit']).
|
||||
to eq(['must be greater than or equal to 0'])
|
||||
expect(json_response['message']['username']).
|
||||
to eq([Gitlab::Regex.send(:default_regex_message)])
|
||||
to eq([Gitlab::Regex.send(:namespace_regex_message)])
|
||||
end
|
||||
|
||||
it "shouldn't available for non admin users" do
|
||||
|
@ -266,7 +266,7 @@ describe API::API, api: true do
|
|||
expect(json_response['message']['projects_limit']).
|
||||
to eq(['must be greater than or equal to 0'])
|
||||
expect(json_response['message']['username']).
|
||||
to eq([Gitlab::Regex.send(:default_regex_message)])
|
||||
to eq([Gitlab::Regex.send(:namespace_regex_message)])
|
||||
end
|
||||
|
||||
context "with existing user" do
|
||||
|
|
Loading…
Reference in a new issue