From 26d2fa0aaa4546ab6d41d08b4f0af66ca5d14ec0 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 20 Jun 2016 12:30:04 -0700 Subject: Rename Code tab to Repo Closes #18830 --- app/views/layouts/nav/_project.html.haml | 4 ++-- features/steps/project/project_find_file.rb | 4 ++-- features/steps/shared/project_tab.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 39ea4920ccc..068332205bb 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -38,9 +38,9 @@ - if project_nav_tab? :files = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases network)) do - = link_to project_files_path(@project), title: 'Code', class: 'shortcuts-tree' do + = link_to project_files_path(@project), title: 'Repo', class: 'shortcuts-tree' do %span - Code + Repo - if project_nav_tab? :pipelines = nav_link(controller: [:pipelines, :builds, :environments]) do diff --git a/features/steps/project/project_find_file.rb b/features/steps/project/project_find_file.rb index 47de4b91df1..9833eec3730 100644 --- a/features/steps/project/project_find_file.rb +++ b/features/steps/project/project_find_file.rb @@ -13,12 +13,12 @@ class Spinach::Features::ProjectFindFile < Spinach::FeatureSteps end step 'I should see "find file" page' do - ensure_active_main_tab('Code') + ensure_active_main_tab('Repo') expect(page).to have_selector('.file-finder-holder', count: 1) end step 'I fill in Find by path with "git"' do - ensure_active_main_tab('Code') + ensure_active_main_tab('Repo') expect(page).to have_selector('.file-finder-holder', count: 1) end diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb index bfee8793301..595913ff3d8 100644 --- a/features/steps/shared/project_tab.rb +++ b/features/steps/shared/project_tab.rb @@ -8,8 +8,8 @@ module SharedProjectTab ensure_active_main_tab('Project') end - step 'the active main tab should be Code' do - ensure_active_main_tab('Code') + step 'the active main tab should be Repo' do + ensure_active_main_tab('Repo') end step 'the active main tab should be Graphs' do -- cgit v1.2.1 From 5c9f0896ef3118b4e381e1834073827f42a10feb Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 20 Jun 2016 12:50:40 -0700 Subject: Rename Code -> Repo in feature specs --- features/project/active_tab.feature | 30 +++++++++++++++--------------- features/project/shortcuts.feature | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature index c4f987a7923..db4507b9889 100644 --- a/features/project/active_tab.feature +++ b/features/project/active_tab.feature @@ -10,9 +10,9 @@ Feature: Project Active Tab Then the active main tab should be Home And no other main tabs should be active - Scenario: On Project Code + Scenario: On Project Repo Given I visit my project's files page - Then the active main tab should be Code + Then the active main tab should be Repo And no other main tabs should be active Scenario: On Project Issues @@ -59,46 +59,46 @@ Feature: Project Active Tab And no other sub navs should be active And the active main tab should be Settings - # Sub Tabs: Code + # Sub Tabs: Repo - Scenario: On Project Code/Files + Scenario: On Project Repo/Files Given I visit my project's files page Then the active sub tab should be Files And no other sub tabs should be active - And the active main tab should be Code + And the active main tab should be Repo - Scenario: On Project Code/Commits + Scenario: On Project Repo/Commits Given I visit my project's commits page Then the active sub tab should be Commits And no other sub tabs should be active - And the active main tab should be Code + And the active main tab should be Repo - Scenario: On Project Code/Network + Scenario: On Project Repo/Network Given I visit my project's network page Then the active sub tab should be Network And no other sub tabs should be active - And the active main tab should be Code + And the active main tab should be Repo - Scenario: On Project Code/Compare + Scenario: On Project Repo/Compare Given I visit my project's commits page And I click the "Compare" tab Then the active sub tab should be Compare And no other sub tabs should be active - And the active main tab should be Code + And the active main tab should be Repo - Scenario: On Project Code/Branches + Scenario: On Project Repo/Branches Given I visit my project's commits page And I click the "Branches" tab Then the active sub tab should be Branches And no other sub tabs should be active - And the active main tab should be Code + And the active main tab should be Repo - Scenario: On Project Code/Tags + Scenario: On Project Repo/Tags Given I visit my project's commits page And I click the "Tags" tab Then the active sub tab should be Tags And no other sub tabs should be active - And the active main tab should be Code + And the active main tab should be Repo Scenario: On Project Issues/Browse Given I visit my project's issues page diff --git a/features/project/shortcuts.feature b/features/project/shortcuts.feature index c73d0b32337..aa5edaaa9d7 100644 --- a/features/project/shortcuts.feature +++ b/features/project/shortcuts.feature @@ -8,21 +8,21 @@ Feature: Project Shortcuts @javascript Scenario: Navigate to files tab Given I press "g" and "f" - Then the active main tab should be Code + Then the active main tab should be Repo Then the active sub tab should be Files @javascript Scenario: Navigate to commits tab Given I visit my project's files page Given I press "g" and "c" - Then the active main tab should be Code + Then the active main tab should be Repo Then the active sub tab should be Commits @javascript Scenario: Navigate to network tab Given I press "g" and "n" Then the active sub tab should be Network - And the active main tab should be Code + And the active main tab should be Repo @javascript Scenario: Navigate to graphs tab -- cgit v1.2.1 From 59fc1816d3df8f9ac27542eac46f93ae85e328ae Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 21 Jun 2016 07:54:02 -0700 Subject: Rename Repo -> Repository --- app/views/layouts/nav/_project.html.haml | 4 ++-- features/project/active_tab.feature | 30 ++++++++++++++--------------- features/project/shortcuts.feature | 6 +++--- features/steps/project/project_find_file.rb | 4 ++-- features/steps/shared/project_tab.rb | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 068332205bb..c6f9cbc60e9 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -38,9 +38,9 @@ - if project_nav_tab? :files = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases network)) do - = link_to project_files_path(@project), title: 'Repo', class: 'shortcuts-tree' do + = link_to project_files_path(@project), title: 'Repository', class: 'shortcuts-tree' do %span - Repo + Repository - if project_nav_tab? :pipelines = nav_link(controller: [:pipelines, :builds, :environments]) do diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature index db4507b9889..57dda9c2234 100644 --- a/features/project/active_tab.feature +++ b/features/project/active_tab.feature @@ -10,9 +10,9 @@ Feature: Project Active Tab Then the active main tab should be Home And no other main tabs should be active - Scenario: On Project Repo + Scenario: On Project Repository Given I visit my project's files page - Then the active main tab should be Repo + Then the active main tab should be Repository And no other main tabs should be active Scenario: On Project Issues @@ -59,46 +59,46 @@ Feature: Project Active Tab And no other sub navs should be active And the active main tab should be Settings - # Sub Tabs: Repo + # Sub Tabs: Repository - Scenario: On Project Repo/Files + Scenario: On Project Repository/Files Given I visit my project's files page Then the active sub tab should be Files And no other sub tabs should be active - And the active main tab should be Repo + And the active main tab should be Repository - Scenario: On Project Repo/Commits + Scenario: On Project Repository/Commits Given I visit my project's commits page Then the active sub tab should be Commits And no other sub tabs should be active - And the active main tab should be Repo + And the active main tab should be Repository - Scenario: On Project Repo/Network + Scenario: On Project Repository/Network Given I visit my project's network page Then the active sub tab should be Network And no other sub tabs should be active - And the active main tab should be Repo + And the active main tab should be Repository - Scenario: On Project Repo/Compare + Scenario: On Project Repository/Compare Given I visit my project's commits page And I click the "Compare" tab Then the active sub tab should be Compare And no other sub tabs should be active - And the active main tab should be Repo + And the active main tab should be Repository - Scenario: On Project Repo/Branches + Scenario: On Project Repository/Branches Given I visit my project's commits page And I click the "Branches" tab Then the active sub tab should be Branches And no other sub tabs should be active - And the active main tab should be Repo + And the active main tab should be Repository - Scenario: On Project Repo/Tags + Scenario: On Project Repository/Tags Given I visit my project's commits page And I click the "Tags" tab Then the active sub tab should be Tags And no other sub tabs should be active - And the active main tab should be Repo + And the active main tab should be Repository Scenario: On Project Issues/Browse Given I visit my project's issues page diff --git a/features/project/shortcuts.feature b/features/project/shortcuts.feature index aa5edaaa9d7..f71f69ef060 100644 --- a/features/project/shortcuts.feature +++ b/features/project/shortcuts.feature @@ -8,21 +8,21 @@ Feature: Project Shortcuts @javascript Scenario: Navigate to files tab Given I press "g" and "f" - Then the active main tab should be Repo + Then the active main tab should be Repository Then the active sub tab should be Files @javascript Scenario: Navigate to commits tab Given I visit my project's files page Given I press "g" and "c" - Then the active main tab should be Repo + Then the active main tab should be Repository Then the active sub tab should be Commits @javascript Scenario: Navigate to network tab Given I press "g" and "n" Then the active sub tab should be Network - And the active main tab should be Repo + And the active main tab should be Repository @javascript Scenario: Navigate to graphs tab diff --git a/features/steps/project/project_find_file.rb b/features/steps/project/project_find_file.rb index 9833eec3730..90771847909 100644 --- a/features/steps/project/project_find_file.rb +++ b/features/steps/project/project_find_file.rb @@ -13,12 +13,12 @@ class Spinach::Features::ProjectFindFile < Spinach::FeatureSteps end step 'I should see "find file" page' do - ensure_active_main_tab('Repo') + ensure_active_main_tab('Repository') expect(page).to have_selector('.file-finder-holder', count: 1) end step 'I fill in Find by path with "git"' do - ensure_active_main_tab('Repo') + ensure_active_main_tab('Repository') expect(page).to have_selector('.file-finder-holder', count: 1) end diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb index 595913ff3d8..d6024212601 100644 --- a/features/steps/shared/project_tab.rb +++ b/features/steps/shared/project_tab.rb @@ -8,8 +8,8 @@ module SharedProjectTab ensure_active_main_tab('Project') end - step 'the active main tab should be Repo' do - ensure_active_main_tab('Repo') + step 'the active main tab should be Repository' do + ensure_active_main_tab('Repository') end step 'the active main tab should be Graphs' do -- cgit v1.2.1