diff options
author | Phil Hughes <me@iamphill.com> | 2017-11-03 11:27:02 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-11-06 10:52:03 +0000 |
commit | e2bcb3a46fd7d29bcbd17101e9a4e8f7d0ca4746 (patch) | |
tree | dfc768f714908a21f6047b02e2c1f28a67606162 /spec | |
parent | 4119e92be5a83d845b8076237f7b0957fc392e7a (diff) | |
download | gitlab-ce-e2bcb3a46fd7d29bcbd17101e9a4e8f7d0ca4746.tar.gz |
fixed specs
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/refs_controller_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/projects/tree/create_directory_spec.rb | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/spec/controllers/projects/refs_controller_spec.rb b/spec/controllers/projects/refs_controller_spec.rb index 4c1315b26c1..748ae040928 100644 --- a/spec/controllers/projects/refs_controller_spec.rb +++ b/spec/controllers/projects/refs_controller_spec.rb @@ -19,13 +19,13 @@ describe Projects::RefsController do format: format end - def xhr_get(format = :html, path = 'foo/bar/baz.html') + def xhr_get(format = :html) xhr :get, :logs_tree, namespace_id: project.namespace.to_param, project_id: project, id: 'master', - path: path, + path: 'foo/bar/baz.html', format: format end @@ -47,12 +47,10 @@ describe Projects::RefsController do end it 'renders JSON' do - xhr_get(:json, '/') + xhr_get(:json) expect(response).to be_success expect(json_response).to be_kind_of(Array) - expect(json_response[0]['type']).to eq('tree') - expect(json_response[0]['file_name']).to eq('bar') end end end diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb index 8ee7b9cf015..1686e7fa342 100644 --- a/spec/features/projects/tree/create_directory_spec.rb +++ b/spec/features/projects/tree/create_directory_spec.rb @@ -31,10 +31,5 @@ feature 'Multi-file editor new directory', :js do click_button('Commit 1 file') expect(page).to have_selector('td', text: 'commit message') - - click_link('foldername') - - expect(page).to have_selector('td', text: 'commit message', count: 2) - expect(page).to have_selector('td', text: '.gitkeep') end end |