Commit Graph

2195 Commits

Author SHA1 Message Date
Rémy Coutable 70c31ab42e
Use #query_scope instead of #parent in a Spinach feature
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-14 09:29:54 +01:00
Mike Greiling 3839dd0dba
enable CHROME_HEADLESS environment variable for Spinach tests similar to RSpec 2017-11-01 11:03:06 -05:00
Mike Greiling 1cf167fc3e
Merge branch 'master' into sh-headless-chrome-support
* master: (84 commits)
  Migrate Gitlab::Git::Wiki#page to Gitaly
  Load participants async
  Normalize LDAP DN when looking up identity
  Improve the maintenance policy page
  add changelog
  fix spec failure
  Allow promoting project milestones to group milestones
  fix specs
  Be able to bundle gems with newer rubies
  Upgrade Ruby to 2.3.5
  fixed up upload feature after master merge
  fix missing issue assignees
  Migrate Gitlab::Git::Wiki#delete_page to Gitaly
  Enable eslint
  Make `#hashed_storage?` require feature argument
  Adds callback function to inital cluster request
  Fix example typo.
  Upload files through the multi-file editor
  get branch name from the DOM
  Resolve "Convert autosize.js library to be a Yarn managed library"
  ...
2017-10-31 16:08:11 -05:00
Eric Eastwood 6dc9028fbb Load participants async 2017-10-31 16:15:03 +00:00
Mike Greiling 519ffa1ebf
Merge branch 'master' into sh-headless-chrome-support
* master: (297 commits)
  Fix deletion of container registry or images returning an error
  The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
  Decrease ABC threshold to 54.28
  Update VERSION to 10.2.0-pre
  Update CHANGELOG.md for 10.1.0
  Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
  Fix the external URLs generated for online view of HTML artifacts
  Use title as placeholder instead of issue title for reusability
  Fix failure in current_settings_spec.rb
  Clarify the difference between project_update and project_rename
  URI decode Page-Title header to preserve UTF-8 characters
  Update Gitaly version to v0.49.0
  Decrease Perceived Complexity threshold to 14
  Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
  Force non diff resolved discussion to display when collapse toggled
  Added submodule support in multi-file editor
  add note about after_script being run separately
  Check for element before evaluate_script
  Merge branch 'master-i18n' into 'master'
  Update Prometheus gem to fix problems with other files overwriting current file
  ...
2017-10-23 10:32:14 +03:00
Rémy Coutable cc8af554fd Merge branch 'feature/reliable-rspec-with-eval-script' into 'master'
Check for element before execute_script

See merge request gitlab-org/gitlab-ce!14898
2017-10-20 18:53:42 +00:00
Eric Eastwood 43377979c6 Check for element before evaluate_script
Tip from
https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara#directly-interacting-with-javascript
2017-10-19 14:01:15 -05:00
Douwe Maan 228bbb3af0 Merge branch 'not-found-in-commits' into 'master'
Renders 404 in commits controller if no commits are found

Closes #37620

See merge request gitlab-org/gitlab-ce!14610
2017-10-19 12:18:42 +00:00
Guilherme Vieira ada114065f Renders 404 in commits controller if no commits are found 2017-10-18 23:41:00 -02:00
Douwe Maan 79e889122b Merge branch 'bvl-group-trees' into 'master'
Show collapsible tree on the project show page

Closes #30343

See merge request gitlab-org/gitlab-ce!14055
2017-10-17 10:03:03 +00:00
Mike Greiling 53e11239ce
Merge branch 'master' into sh-headless-chrome-support
* master: (104 commits)
  Update licenses
  fix a wrong method call in the refactor
  fix a whitespace
  fix for discussion
  Update templates via:
  Update doc accordingly to:
  Cache issuable template names
  Fix the format of rugged alternate directory list
  Match full file path in FileDetector
  Fixes from CSS refactor
  Resolve "Prometheus service page shows error"
  Explicit state integration deletion
  Move all API authentication code to APIGuard
  Shorten example translation for inclusive language
  [ci-skip] add changelog
  fix the merger override to remove source branch
  add spec
  Removed d3.js  from the users and graphs bundle
  Cleanup data-page attribute after each Karma test
  Update template description wording
  ...
2017-10-12 17:52:09 -05:00
Mike Greiling 64a51194c7
fix spinach test for branch validation 2017-10-12 17:08:00 -05:00
Bob Van Landuyt bd8943f5ad Fix spinach features
And several other failures
2017-10-11 14:16:40 +02:00
Vitaliy @blackst0ne Klachkov bd69b79435 Replace the 'features/explore/projects.feature' spinach test with an rspec analog 2017-10-11 15:26:04 +11:00
Mike Greiling f783798825
Merge branch 'master' into sh-headless-chrome-support
* master: (113 commits)
  Introduce new hook data builders for Issue and MergeRequest
  Don't create todos for old issue assignees
  Start adding Gitlab::HookData::IssuableBuilder
  Include the changes in issuable webhook payloads
  Rename the `codeclimate` job to `codequality`
  Don't show an "Unsubscribe" link in snippet comment notifications
  Add QA::Scenario::Gitlab::Group::Create
  Removes CommitsList from global namespace
  Fix wiki empty page translation namespace not being removed
  Fixes mini graph in commit view
  Fix link to new i18n index page
  Update i18n docs
  Move i18n/introduction to i18n/index
  Resolve "Simple documentation update - backup to restore in restore section"
  Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespace
  Move cycle analytics banner into a vue file
  Updated Icons + Fix for Collapsed Groups Angle
  Don't create fork networks for root projects that are deleted
  Remove executable permissions on images to make docs lint happy
  Sync up hard coded DN class in migration
  ...
2017-10-09 15:00:00 -05:00
Bob Van Landuyt e8ca579d88 Add a project forks spec helper
The helper creates a fork of a project with all provided attributes,
but skipping the creation of the repository on disk.
2017-10-07 11:46:23 +02:00
Jose Ivan Vargas 02838d5be2 Merge branch 'master' into sh-headless-chrome-support 2017-10-06 17:15:44 -05:00
Rémy Coutable ef14e6b38f Merge branch 'replace_project_merge_requests.feature' into 'master'
Replace the 'project/merge_requests.feature' spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!14621
2017-10-06 16:12:23 +00:00
Vitaliy @blackst0ne Klachkov 2fc45e4d7e Replace the 'project/merge_requests.feature' spinach test with an rspec analog 2017-10-05 09:31:34 +11:00
Filipa Lacerda 6552ec3d26 Merge branch 'fork-layout-cleanup' into 'master'
Cleanup the fork layout

See merge request gitlab-org/gitlab-ce!14617
2017-10-04 15:59:43 +00:00
Jose Ivan Vargas f682cc189a Merge branch 'master' into sh-headless-chrome-support 2017-10-03 12:11:56 -05:00
Phil Hughes 7dbdc9837c Merge branch 'dm-copy-parallel-diff' into 'master'
Only copy old/new code when selecting left/right side of parallel diff

See merge request gitlab-org/gitlab-ce!14561
2017-10-03 09:44:38 +00:00
Douwe Maan b74c643c66 Only copy old/new code when selecting left/right side of parallel diff 2017-10-02 18:39:25 +02:00
Phil Hughes 193bc52686
fixed specs 2017-10-02 14:46:56 +01:00
Eric Eastwood 6f9a6d37a9 Merge branch 'master' into ff_port_from_ee 2017-09-26 16:24:54 -05:00
Jose Ivan Vargas b4af546820 Merge branch 'master' into sh-headless-chrome-support 2017-09-26 12:14:42 -05:00
Vitaliy @blackst0ne Klachkov 0d236638b6 Improve list of sorting options 2017-09-23 11:46:53 +11:00
Rémy Coutable c01bd64f56 Merge branch 'replace_project_shortcuts.feature' into 'master'
Replace the 'project/shortcuts.feature' spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!14431
2017-09-22 11:14:55 +00:00
Rémy Coutable d103e95513 Merge branch 'add-view-replaced-file-link' into 'master'
Add view replaced file link for image diffs

See merge request gitlab-org/gitlab-ce!14394
2017-09-22 06:28:53 +00:00
Vitaliy @blackst0ne Klachkov 0fc604e522 Replace the 'project/service.feature' spinach test with an rspec analog 2017-09-22 15:42:52 +11:00
Vitaliy @blackst0ne Klachkov 0ed3d8a07b Replace the 'project/shortcuts.feature' spinach test with an rspec analog 2017-09-22 14:29:19 +11:00
Clement Ho 9c096ddf28 Add view replaced file link for image diffs 2017-09-20 09:39:12 -05:00
Eric Eastwood 761b2e9890 Port fast-foward spinach specs from EE 2017-09-19 23:48:40 -05:00
Mike Greiling 27a28d9970 Merge branch 'master' into sh-headless-chrome-support
* master: (97 commits)
  Eliminate N+1 queries in loading discussions.json endpoint
  Clean up read_registry scope changes
  Add missing import statements
  Improve “New project“ page description
  Fix notification message when admin label was modified
  Remove gaps under nav on build page
  Replace the 'project/snippets.feature' spinach test with an rspec analog
  Use correct group members path for members flyout link
  Fix docs for lightweight tag creation via API
  Replace the 'project/commits/revert.feature' spinach test with an rspec analog
  Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'
  Replace the 'project/archived.feature' spinach test with an rspec analog
  Fix broken link in docs/api/wiki.md
  Fixed the new sidebars width when browser has scrollbars
  Improve 'spec/features/profiles/*' specs
  Replace the 'search.feature' spinach test with an rspec analog
  dedupe yarn packages
  add dependency approvals (all MIT license)
  update build image to latest with node 8.x, yarn 1.0.2, and chrome 61
  Ensure we use `Entities::User` for non-admin `users/:id` API requests
  ...
2017-09-18 13:05:34 -05:00
Rémy Coutable bff004d44b Merge branch 'replace_project_snippets.feature' into 'master'
Replace the 'project/snippets.feature' spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!14326
2017-09-18 09:54:02 +00:00
Rémy Coutable fffae7a0bf Merge branch 'replace_project_commits_revert.feature' into 'master'
Replace the 'project/commits/revert.feature' spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!14325
2017-09-18 08:44:01 +00:00
Rémy Coutable d73eb894ca Merge branch 'replace_project_archived.feature' into 'master'
Replace the 'project/archived.feature' spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!14322
2017-09-18 08:39:32 +00:00
Vitaliy @blackst0ne Klachkov 5d3165d41e Replace the 'project/snippets.feature' spinach test with an rspec analog 2017-09-18 18:52:28 +11:00
Vitaliy @blackst0ne Klachkov b5a091e3a4 Replace the 'project/commits/revert.feature' spinach test with an rspec analog 2017-09-18 16:15:42 +11:00
Vitaliy @blackst0ne Klachkov e6d5a6a370 Replace the 'project/archived.feature' spinach test with an rspec analog 2017-09-17 17:12:03 +11:00
Vitaliy @blackst0ne Klachkov b3d79b1ff4 Replace the 'search.feature' spinach test with an rspec analog 2017-09-16 20:02:30 +11:00
Jose Ivan Vargas 4c0beb6c02 Merge branch 'master' into sh-headless-chrome-support 2017-09-13 12:21:33 -05:00
Vitaliy @blackst0ne Klachkov 297dfe6ab9 Replace the 'profile/active_tab.feature' spinach test with an rspec analog 2017-09-13 10:01:44 +11:00
Rémy Coutable 5fde2c6289 Merge branch 'replace_project_issues_award_emoji.feature' into 'master'
Replace the 'project/issues/award_emoji.feature' spinach test with an rspec analog

See merge request !14202
2017-09-12 11:44:43 +00:00
Vitaliy @blackst0ne Klachkov 6f0a727ec8 Replace the 'project/builds/summary.feature' spinach test with an rspec analog 2017-09-12 20:58:16 +11:00
Vitaliy @blackst0ne Klachkov afaa72a047 Replace the 'project/issues/award_emoji.feature' spinach test with an rspec analog 2017-09-12 20:55:34 +11:00
Rémy Coutable 19df4a8a87 Merge branch 'replace_project_merge_requests_revert.feature' into 'master'
Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog

See merge request !14201
2017-09-12 06:37:40 +00:00
Rémy Coutable 90ac1bfb55 Merge branch 'replace_milestone.feature' into 'master'
Replace the 'project/milestone.feature' spinach test with an rspec analog

See merge request !14171
2017-09-12 06:35:16 +00:00
Vitaliy @blackst0ne Klachkov 44a1759f19 Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog 2017-09-12 11:52:35 +11:00
Vitaliy @blackst0ne Klachkov c0b0e506e3 Replace the project/milestone.feature spinach test with an rspec analog 2017-09-12 07:41:57 +11:00