diff options
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/merge_request/user_sees_merge_widget_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/u2f_spec.rb | 10 | ||||
-rw-r--r-- | spec/javascripts/boards/modal_store_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/deploy_keys/components/app_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/sidebar/sidebar_subscriptions_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/u2f/register_spec.js | 2 | ||||
-rw-r--r-- | spec/lib/mattermost/session_spec.rb | 4 | ||||
-rw-r--r-- | spec/presenters/project_presenter_spec.rb | 2 | ||||
-rw-r--r-- | spec/support/helpers/test_env.rb | 4 |
10 files changed, 17 insertions, 17 deletions
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index b285cd7a7ac..a5dc9017699 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -160,7 +160,7 @@ describe 'Merge request > User sees merge widget', :js do end end - context 'view merge request where project has CI setup but no CI status' do + context 'view merge request where project has CI set up but no CI status' do before do pipeline = create(:ci_pipeline, project: project, sha: merge_request.diff_head_sha, @@ -178,7 +178,7 @@ describe 'Merge request > User sees merge widget', :js do end end - context 'view merge request in project with only-mwps setting enabled but no CI is setup' do + context 'view merge request in project with only-mwps setting enabled but no CI is set up' do before do visit project_merge_request_path(project_only_mwps, merge_request_in_only_mwps_project) end diff --git a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb index 25b74cc481d..70f3a812ee9 100644 --- a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb +++ b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'Setup Mattermost slash commands', :js do +describe 'Set up Mattermost slash commands', :js do let(:user) { create(:user) } let(:project) { create(:project) } let(:service) { project.create_mattermost_slash_commands_service } diff --git a/spec/features/u2f_spec.rb b/spec/features/u2f_spec.rb index f245c1ebbd9..f1192f48b86 100644 --- a/spec/features/u2f_spec.rb +++ b/spec/features/u2f_spec.rb @@ -3,14 +3,14 @@ require 'spec_helper' describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do def manage_two_factor_authentication click_on 'Manage two-factor authentication' - expect(page).to have_content("Setup new U2F device") + expect(page).to have_content("Set up new U2F device") wait_for_requests end def register_u2f_device(u2f_device = nil, name: 'My device') u2f_device ||= FakeU2fDevice.new(page, name) u2f_device.respond_to_u2f_registration - click_on 'Setup new U2F device' + click_on 'Set up new U2F device' expect(page).to have_content('Your device was successfully set up') fill_in "Pick a name", with: name click_on 'Register U2F device' @@ -34,7 +34,7 @@ describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do visit profile_account_path click_on 'Enable two-factor authentication' - expect(page).to have_button('Setup new U2F device', disabled: true) + expect(page).to have_button('Set up new U2F device', disabled: true) end end @@ -109,7 +109,7 @@ describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do # Have the "u2f device" respond with bad data page.execute_script("u2f.register = function(_,_,_,callback) { callback('bad response'); };") - click_on 'Setup new U2F device' + click_on 'Set up new U2F device' expect(page).to have_content('Your device was successfully set up') click_on 'Register U2F device' @@ -124,7 +124,7 @@ describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do # Failed registration page.execute_script("u2f.register = function(_,_,_,callback) { callback('bad response'); };") - click_on 'Setup new U2F device' + click_on 'Set up new U2F device' expect(page).to have_content('Your device was successfully set up') click_on 'Register U2F device' expect(page).to have_content("The form contains the following error") diff --git a/spec/javascripts/boards/modal_store_spec.js b/spec/javascripts/boards/modal_store_spec.js index a234c81fadf..3257a3fb8a3 100644 --- a/spec/javascripts/boards/modal_store_spec.js +++ b/spec/javascripts/boards/modal_store_spec.js @@ -11,7 +11,7 @@ describe('Modal store', () => { let issue2; beforeEach(() => { - // Setup default state + // Set up default state Store.store.issues = []; Store.store.selectedIssues = []; diff --git a/spec/javascripts/deploy_keys/components/app_spec.js b/spec/javascripts/deploy_keys/components/app_spec.js index 183d7cf2d41..cd147bb2935 100644 --- a/spec/javascripts/deploy_keys/components/app_spec.js +++ b/spec/javascripts/deploy_keys/components/app_spec.js @@ -11,7 +11,7 @@ describe('Deploy keys app component', () => { let mock; beforeEach((done) => { - // setup axios mock before component + // set up axios mock before component mock = new MockAdapter(axios); mock.onGet(`${TEST_HOST}/dummy/`).replyOnce(200, data); diff --git a/spec/javascripts/sidebar/sidebar_subscriptions_spec.js b/spec/javascripts/sidebar/sidebar_subscriptions_spec.js index 9e437084224..af2fde0a5be 100644 --- a/spec/javascripts/sidebar/sidebar_subscriptions_spec.js +++ b/spec/javascripts/sidebar/sidebar_subscriptions_spec.js @@ -12,7 +12,7 @@ describe('Sidebar Subscriptions', function () { beforeEach(() => { SidebarSubscriptions = Vue.extend(sidebarSubscriptions); - // Setup the stores, services, etc + // Set up the stores, services, etc // eslint-disable-next-line no-new new SidebarMediator(Mock.mediator); }); diff --git a/spec/javascripts/u2f/register_spec.js b/spec/javascripts/u2f/register_spec.js index d9383314891..b774627651f 100644 --- a/spec/javascripts/u2f/register_spec.js +++ b/spec/javascripts/u2f/register_spec.js @@ -16,7 +16,7 @@ describe('U2FRegister', function () { it('allows registering a U2F device', () => { const setupButton = this.container.find('#js-setup-u2f-device'); - expect(setupButton.text()).toBe('Setup new U2F device'); + expect(setupButton.text()).toBe('Set up new U2F device'); setupButton.trigger('click'); const inProgressMessage = this.container.children('p'); expect(inProgressMessage.text()).toContain('Trying to communicate with your device'); diff --git a/spec/lib/mattermost/session_spec.rb b/spec/lib/mattermost/session_spec.rb index b7687d48c68..f18f97a9c6a 100644 --- a/spec/lib/mattermost/session_spec.rb +++ b/spec/lib/mattermost/session_spec.rb @@ -82,7 +82,7 @@ describe Mattermost::Session, type: :request do .to_return(headers: { Authorization: 'token thisworksnow' }, status: 200) end - it 'can setup a session' do + it 'can set up a session' do subject.with_session do |session| end @@ -106,7 +106,7 @@ describe Mattermost::Session, type: :request do expect_to_obtain_exclusive_lease(lease_key, 'uuid') expect_to_cancel_exclusive_lease(lease_key, 'uuid') - # Cannot setup a session, but we should still cancel the lease + # Cannot set up a session, but we should still cancel the lease expect { subject.with_session }.to raise_error(Mattermost::NoSessionError) end diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb index d9fb27e101e..96193784072 100644 --- a/spec/presenters/project_presenter_spec.rb +++ b/spec/presenters/project_presenter_spec.rb @@ -412,7 +412,7 @@ describe ProjectPresenter do end describe '#koding_anchor_data' do - it 'returns link to setup Koding if user can push and no koding YML exists' do + it 'returns link to set up Koding if user can push and no koding YML exists' do project.add_developer(user) allow(project.repository).to receive(:koding_yml).and_return(nil) allow(Gitlab::CurrentSettings).to receive(:koding_enabled?).and_return(true) diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 8e8ec574edb..97875669d0e 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -85,7 +85,7 @@ module TestEnv clean_test_path - # Setup GitLab shell for test instance + # Set up GitLab shell for test instance setup_gitlab_shell setup_gitaly @@ -367,7 +367,7 @@ module TestEnv FileUtils.rm_rf(install_dir) exit 1 ensure - puts " #{component} setup in #{Time.now - start} seconds...\n" + puts " #{component} set up in #{Time.now - start} seconds...\n" end def ensure_component_dir_name_is_correct!(component, path) |