Merge branch 'master' into sh-headless-chrome-support

3 files changed, 18 insertions, 14 deletions

diff --git a/spec/features/profiles/account_spec.rb b/spec/features/profiles/account_spec.rb
index 56c1f7ae9c7..9944a6e1ff1 100644
--- a/spec/features/profiles/account_spec.rb
+++ b/spec/features/profiles/account_spec.rb
@@ -27,7 +27,7 @@ feature 'Profile > Account' do
     end
 
     context 'with a project' do
-      given!(:project) { create(:empty_project, namespace: user.namespace) }
+      given!(:project) { create(:project, namespace: user.namespace) }
       given(:new_project_path) { "/#{new_username}/#{project.path}" }
       given(:old_project_path) { "/#{user.username}/#{project.path}" }
 
diff --git a/spec/features/profiles/preferences_spec.rb b/spec/features/profiles/preferences_spec.rb
index 3b57ff47d33..091fb3a356c 100644
--- a/spec/features/profiles/preferences_spec.rb
+++ b/spec/features/profiles/preferences_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Profile > Preferences' do
+describe 'Profile > Preferences', :js do
   let(:user) { create(:user) }
 
   before do
@@ -8,28 +8,32 @@ describe 'Profile > Preferences' do
     visit profile_preferences_path
   end
 
-  describe 'User changes their syntax highlighting theme', js: true do
+  describe 'User changes their syntax highlighting theme' do
     it 'creates a flash message' do
       choose 'user_color_scheme_id_5'
 
+      wait_for_requests
+
       expect_preferences_saved_message
     end
 
     it 'updates their preference' do
       choose 'user_color_scheme_id_5'
 
-      allowing_for_delay do
-        visit page.current_path
-        expect(page).to have_checked_field('user_color_scheme_id_5')
-      end
+      wait_for_requests
+      refresh
+
+      expect(page).to have_checked_field('user_color_scheme_id_5')
     end
   end
 
-  describe 'User changes their default dashboard', js: true do
+  describe 'User changes their default dashboard' do
     it 'creates a flash message' do
       select 'Starred Projects', from: 'user_dashboard'
       click_button 'Save'
 
+      wait_for_requests
+
       expect_preferences_saved_message
     end
 
@@ -37,12 +41,12 @@ describe 'Profile > Preferences' do
       select 'Starred Projects', from: 'user_dashboard'
       click_button 'Save'
 
-      allowing_for_delay do
-        find('#logo').click
+      wait_for_requests
+
+      find('#logo').click
 
-        expect(page).to have_content("You don't have starred projects yet")
-        expect(page.current_path).to eq starred_dashboard_projects_path
-      end
+      expect(page).to have_content("You don't have starred projects yet")
+      expect(page.current_path).to eq starred_dashboard_projects_path
 
       find('.shortcuts-activity').click
 
diff --git a/spec/features/profiles/user_visits_notifications_tab_spec.rb b/spec/features/profiles/user_visits_notifications_tab_spec.rb
index c2c17df67fb..e0feed02259 100644
--- a/spec/features/profiles/user_visits_notifications_tab_spec.rb
+++ b/spec/features/profiles/user_visits_notifications_tab_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'User visits the notifications tab', js: true do
-  let(:project) { create(:empty_project) }
+  let(:project) { create(:project) }
   let(:user) { create(:user) }
 
   before do