summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-10-31 09:06:23 +0000
committerPhil Hughes <me@iamphill.com>2017-10-31 09:06:23 +0000
commit662f87ca372515f0b739796b31c7e242f1ebcd7f (patch)
tree6f0e5e00c3c2d6f183fd06c3b3466149223561cc
parent098a98055abd32a7049b5429064f1ed45e45eea8 (diff)
downloadgitlab-ce-662f87ca372515f0b739796b31c7e242f1ebcd7f.tar.gz
spec fixes
-rw-r--r--app/assets/stylesheets/pages/repo.scss5
-rw-r--r--spec/features/projects/tree/create_file_spec.rb2
-rw-r--r--spec/javascripts/repo/components/new_dropdown/modal_spec.js2
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 44831288541..45aaeb77a48 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -32,6 +32,7 @@
}
.tree-content-holder {
+ display: -webkit-flex;
display: flex;
min-height: 300px;
}
@@ -134,6 +135,10 @@
vertical-align: middle;
text-decoration: none;
margin-right: 12px;
+
+ &:focus {
+ outline: none;
+ }
}
.close-btn {
diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb
index a67ec891e7c..ed3b52a5790 100644
--- a/spec/features/projects/tree/create_file_spec.rb
+++ b/spec/features/projects/tree/create_file_spec.rb
@@ -28,8 +28,6 @@ feature 'Multi-file editor new file', :js do
click_button('Create file')
end
- find('.inputarea').send_keys('file content')
-
fill_in('commit-message', with: 'commit message')
click_button('Commit 1 file')
diff --git a/spec/javascripts/repo/components/new_dropdown/modal_spec.js b/spec/javascripts/repo/components/new_dropdown/modal_spec.js
index ed0a443fded..1ff7590ec79 100644
--- a/spec/javascripts/repo/components/new_dropdown/modal_spec.js
+++ b/spec/javascripts/repo/components/new_dropdown/modal_spec.js
@@ -19,6 +19,7 @@ describe('new file modal component', () => {
beforeEach(() => {
vm = createComponentWithStore(Component, store, {
type,
+ path: '',
}).$mount();
vm.entryName = 'testing';
@@ -187,6 +188,7 @@ describe('new file modal component', () => {
vm = createComponentWithStore(Component, store, {
type: 'tree',
+ path: '',
}).$mount('.js-test');
expect(document.activeElement).toBe(vm.$refs.fieldName);