Skip to content

G
gitlab-ce
Commit 902f588f authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in spec/javascripts/environments/environments_app_spec.js 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 3c50e0ed
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
spec/javascripts/environments/environments_app_spec.js
View file @ 902f588f
...@@ -128,10 +128,7 @@ describe('Environment', () => { ...@@ -128,10 +128,7 @@ describe('Environment', () => {
setTimeout(() => { setTimeout(() => {
spyOn(component, 'updateContent'); spyOn(component, 'updateContent');
component.$el.querySelector('.js-environments-tab-stopped').click(); component.$el.querySelector('.js-environments-tab-stopped').click();
<<<<<<< HEAD:spec/javascripts/environments/environments_app_spec.js
=======
>>>>>>> origin/master:spec/javascripts/environments/environments_app_spec.js
expect(component.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' }); expect(component.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
done(); done();
}); });
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7