From 9afd372e9819cfc4ca56808fcb1cf89308fb73ea Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Fri, 4 Aug 2017 10:41:18 +0200 Subject: [PATCH 1/3] Fix repo-editor title border radius --- app/assets/stylesheets/pages/repo.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 09fe11b53af..38bb08da281 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -247,6 +247,10 @@ width: 100%; display: inline-block; + &:first-child { + border-top-left-radius: 2px; + } + .title { display: inline-block; font-size: 10px; From c3afc61f8a9de4cf70463b0e4dc5ccf76603cce0 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 4 Aug 2017 12:15:36 +0100 Subject: [PATCH 2/3] Fix repo_file_buttons_spec --- .../repo/components/repo_file_buttons_spec.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spec/javascripts/repo/components/repo_file_buttons_spec.js b/spec/javascripts/repo/components/repo_file_buttons_spec.js index cf5fbe1c1d8..19f6bd648c3 100644 --- a/spec/javascripts/repo/components/repo_file_buttons_spec.js +++ b/spec/javascripts/repo/components/repo_file_buttons_spec.js @@ -13,6 +13,10 @@ describe('RepoFileButtons', () => { const activeFile = { extension: 'md', url: 'url', + raw_path: 'raw_path', + blame_path: 'blame_path', + commits_path: 'commits_path', + permalink: 'permalink', }; const activeFileLabel = 'activeFileLabel'; RepoStore.openedFiles = new Array(1); @@ -27,11 +31,11 @@ describe('RepoFileButtons', () => { expect(vm.$el.id).toEqual('repo-file-buttons'); expect(vm.$el.style.borderBottom).toEqual('1px solid rgb(31, 120, 209)'); - expect(raw.href).toMatch(`/${activeFile.url}`); + expect(raw.href).toMatch(`/${activeFile.raw_path}`); expect(raw.textContent).toEqual('Raw'); - expect(blame.href).toMatch(`/${activeFile.url}`); + expect(blame.href).toMatch(`/${activeFile.blame_path}`); expect(blame.textContent).toEqual('Blame'); - expect(history.href).toMatch(`/${activeFile.url}`); + expect(history.href).toMatch(`/${activeFile.commits_path}`); expect(history.textContent).toEqual('History'); expect(vm.$el.querySelector('.permalink').textContent).toEqual('Permalink'); expect(vm.$el.querySelector('.preview').textContent).toEqual(activeFileLabel); From 38a6127160924facb7dc085237cabbbe6c86346d Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Fri, 4 Aug 2017 12:15:51 +0100 Subject: [PATCH 3/3] Fix repo_file_options_spec --- spec/javascripts/repo/components/repo_file_options_spec.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/javascripts/repo/components/repo_file_options_spec.js b/spec/javascripts/repo/components/repo_file_options_spec.js index 86c81e4b5fc..9759b4bf12d 100644 --- a/spec/javascripts/repo/components/repo_file_options_spec.js +++ b/spec/javascripts/repo/components/repo_file_options_spec.js @@ -20,8 +20,6 @@ describe('RepoFileOptions', () => { expect(vm.$el.classList.contains('repo-file-options')).toBeTruthy(); expect(vm.$el.querySelector('.title').textContent).toEqual(projectName); - expect(vm.$el.querySelector('a[title="New File"]')).toBeTruthy(); - expect(vm.$el.querySelector('a[title="New Folder"]')).toBeTruthy(); }); it('does not render if isMini is false', () => {