Commit 24f0ddb0 authored by Mayra Cabrera's avatar Mayra Cabrera

Fixes conflicts on file specs

parent 3be9635e
...@@ -91,8 +91,8 @@ RSpec.describe Gitlab::Ci::Config::External::File::Base do ...@@ -91,8 +91,8 @@ RSpec.describe Gitlab::Ci::Config::External::File::Base do
end end
it 'is not a valid file' do it 'is not a valid file' do
expect(subject).not_to be_valid expect(valid?).to be_falsy
expect(subject.error_message).to eq('Included file `some/file/xxxxxxxxxxxxxxxx.yml` does not have valid YAML syntax!') expect(file.error_message).to eq('Included file `some/file/xxxxxxxxxxxxxxxx.yml` does not have valid YAML syntax!')
end end
end end
end end
......
...@@ -121,7 +121,7 @@ RSpec.describe Gitlab::Ci::Config::External::File::Project do ...@@ -121,7 +121,7 @@ RSpec.describe Gitlab::Ci::Config::External::File::Project do
end end
it 'returns false' do it 'returns false' do
expect(project_file).not_to be_valid expect(valid?).to be_falsy
expect(project_file.error_message).to include("Project `#{project.full_path}` file `/xxxxxxxxxxx.yml` is empty!") expect(project_file.error_message).to include("Project `#{project.full_path}` file `/xxxxxxxxxxx.yml` is empty!")
end end
end end
...@@ -145,13 +145,8 @@ RSpec.describe Gitlab::Ci::Config::External::File::Project do ...@@ -145,13 +145,8 @@ RSpec.describe Gitlab::Ci::Config::External::File::Project do
end end
it 'returns false' do it 'returns false' do
<<<<<<< HEAD
expect(valid?).to be_falsy expect(valid?).to be_falsy
expect(project_file.error_message).to include("Project `#{project.full_path}` file `/invalid-file.yml` does not exist!")
=======
expect(project_file).not_to be_valid
expect(project_file.error_message).to include("Project `#{project.full_path}` file `/xxxxxxxxxxxxxxxxxxx.yml` does not exist!") expect(project_file.error_message).to include("Project `#{project.full_path}` file `/xxxxxxxxxxxxxxxxxxx.yml` does not exist!")
>>>>>>> security/master
end end
end end
......
...@@ -62,7 +62,7 @@ RSpec.describe Gitlab::Ci::Config::External::File::Template do ...@@ -62,7 +62,7 @@ RSpec.describe Gitlab::Ci::Config::External::File::Template do
let(:context_params) { { project: project, sha: '12345', user: user, variables: variables } } let(:context_params) { { project: project, sha: '12345', user: user, variables: variables } }
it 'returns false' do it 'returns false' do
expect(template_file).not_to be_valid expect(valid?).to be_falsy
expect(template_file.error_message).to include('`xxxxxxxxxxxxxx.yml` is not a valid location!') expect(template_file.error_message).to include('`xxxxxxxxxxxxxx.yml` is not a valid location!')
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment