diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-07 14:17:00 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-07 14:17:00 +0000 |
commit | e0da2c352325c1cb2ede88a73434ed7afc037481 (patch) | |
tree | 8e0b8f940aa8295ffff5bbaedcc5a3b1da2f0f21 /features | |
parent | 954dd7ce876330446698b32faa0f42659791336a (diff) | |
parent | 2b31989582a7e1edef79ebc541a99ffed95f497c (diff) | |
download | gitlab-ce-e0da2c352325c1cb2ede88a73434ed7afc037481.tar.gz |
Merge branch 'ui-improvements' into 'master'
Ui improvements
* fix project home page when activity set as default
* style commits, branches and tags pages to new style
* render flash message outside of content block
* style group pages
See merge request !1255
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/project/commits/commits.rb | 1 | ||||
-rw-r--r-- | features/steps/shared/active_tab.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb index e7dd20191b7..23e67371f96 100644 --- a/features/steps/project/commits/commits.rb +++ b/features/steps/project/commits/commits.rb @@ -52,7 +52,6 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps end step 'I see compared refs' do - expect(page).to have_content "Compare View" expect(page).to have_content "Commits (1)" expect(page).to have_content "Showing 2 changed files" end diff --git a/features/steps/shared/active_tab.rb b/features/steps/shared/active_tab.rb index 92e099315d8..eb2ccd9d01e 100644 --- a/features/steps/shared/active_tab.rb +++ b/features/steps/shared/active_tab.rb @@ -6,7 +6,7 @@ module SharedActiveTab end def ensure_active_sub_tab(content) - expect(find('div.content ul.nav-tabs li.active')).to have_content(content) + expect(find('div.content ul.center-top-menu li.active')).to have_content(content) end def ensure_active_sub_nav(content) @@ -18,7 +18,7 @@ module SharedActiveTab end step 'no other sub tabs should be active' do - expect(page).to have_selector('div.content ul.nav-tabs li.active', count: 1) + expect(page).to have_selector('div.content ul.center-top-menu li.active', count: 1) end step 'no other sub navs should be active' do |