diff options
author | winh <winnie@gitlab.com> | 2017-05-18 20:53:14 +0200 |
---|---|---|
committer | winh <winnie@gitlab.com> | 2017-06-02 16:30:37 +0200 |
commit | 0583916d2d9ad19ae342a13ff2a31c9e3bb76547 (patch) | |
tree | 967b2e45b0f60de7b4a0880b35ef5408e05f6e6c /spec/features/issues | |
parent | f032731e47f2ce1c2feb6ff866754202efb6844b (diff) | |
download | gitlab-ce-0583916d2d9ad19ae342a13ff2a31c9e3bb76547.tar.gz |
Style people in issuable search bar (!11402)winh-styled-people-search-bar
Diffstat (limited to 'spec/features/issues')
-rw-r--r-- | spec/features/issues/filtered_search/filter_issues_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/issues/filtered_search/visual_tokens_spec.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb index 7958ad7e24f..e5e4ba06b5a 100644 --- a/spec/features/issues/filtered_search/filter_issues_spec.rb +++ b/spec/features/issues/filtered_search/filter_issues_spec.rb @@ -6,7 +6,7 @@ describe 'Filter issues', js: true, feature: true do let!(:group) { create(:group) } let!(:project) { create(:project, group: group) } - let!(:user) { create(:user, username: 'joe') } + let!(:user) { create(:user, username: 'joe', name: 'Joe') } let!(:user2) { create(:user, username: 'jane') } let!(:label) { create(:label, project: project) } let!(:wontfix) { create(:label, project: project, title: "Won't fix") } diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb index 96e87c82d2c..dbbafc9e004 100644 --- a/spec/features/issues/filtered_search/visual_tokens_spec.rb +++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' describe 'Visual tokens', js: true, feature: true do include FilteredSearchHelpers + include WaitForRequests let!(:project) { create(:empty_project) } let!(:user) { create(:user, name: 'administrator', username: 'root') } @@ -70,7 +71,8 @@ describe 'Visual tokens', js: true, feature: true do end it 'changes value in visual token' do - expect(first('.tokens-container .filtered-search-token .value').text).to eq("@#{user_rock.username}") + wait_for_requests + expect(first('.tokens-container .filtered-search-token .value').text).to eq("#{user_rock.name}") end it 'moves input to the right' do |