Dmitriy Zaporozhets
4e4866f255
Refactor pre/post receive commit services into one class
2015-08-14 16:04:17 +02:00
Dmitriy Zaporozhets
9649f9387a
Fix tests for web editor
2015-08-14 15:08:31 +02:00
Dmitriy Zaporozhets
9011a32234
Disable pre-receive check in test env
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 13:27:51 +02:00
Dmitriy Zaporozhets
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c8 , reversing
changes made to 2f706fbd23 .
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f41 , reversing
changes made to 6b9dbe9f5a .
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 10:28:42 +02:00
Robert Speicher
fb6dc1f07d
Add `Group#add_*` convenience methods
...
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-07 00:20:02 -04:00
Dmitriy Zaporozhets
b48b07044b
Merge branch 'master' into drop-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:42:36 +02:00
Dmitriy Zaporozhets
b118f648cb
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-08-03 11:04:04 +02:00
Jacob Vosmaer
05b518aa4d
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions
2015-07-29 15:44:04 +02:00
Robert Speicher
8c957b54f5
Fix setup/teardown for Markdown feature spec
...
Prior, CI seemed to be freezing after running these specs.
2015-07-29 00:06:52 -04:00
Robert Speicher
05f9a6a9c4
Update Markdown feature to allow for multiple pipelines
2015-07-28 18:56:27 -04:00
Robert Speicher
590fca0f06
Move MarkdownFeature to its own support file
...
This file's about to get much bigger and this removes some of the extra
noise.
2015-07-28 18:56:26 -04:00
Jacob Vosmaer
0be6debb0b
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions
2015-07-27 11:22:35 +02:00
Stan Hu
562242cb9d
Fix commit data retrieval when branch name has single quotes
...
Closes #1724
2015-07-26 03:47:01 -07:00
Jacob Vosmaer
39a7e210a3
Use a separate backup test directory and nuke its contents
2015-07-24 18:54:06 +02:00
Douwe Maan
546731244a
Merge branch 'rs-security-spec-speed' into 'master'
...
Speed up security feature specs
Before: `rspec spec/features/security/ 0.12s user 0.04s system 0% cpu 3:38.00 total`
After: `rspec spec/features/security/ 0.12s user 0.04s system 0% cpu 1:40.58 total`
The majority of the speed improvements is from two things:
1. Instead of using our standard `login_as` helper in the matchers, we take advantage
of the `Warden::Test::Helpers` version of the method which bypasses the login form
and logs the user in directly. We were essentially testing that filling out the login
form works hundreds of times.
2. There were many tests that verified if a user of a certain access level
(master, owner, reporter, guest) had access to a resource. Unfortunately we were
creating every type of user for each test even though a test was only verifying one of
them at a time. Now the tests only create the one user role they're testing.
See merge request !1023
2015-07-22 09:22:43 +00:00
Robert Speicher
0d5cf111f3
Move custom matchers to their own files under spec/support/matchers
2015-07-22 00:01:17 -04:00
Robert Speicher
a2ecfdc585
Move access-related matchers to their own module
2015-07-22 00:01:17 -04:00
Robert Speicher
1fee24a361
Remove unused `be_valid_commit` matcher
2015-07-21 22:11:08 -04:00
Stan Hu
643557dabc
Fix 404 error in files view after deleting the last file in a repository
...
Closes #1362
2015-07-21 14:12:43 -07:00
Dmitriy Zaporozhets
abd2bc00f9
Fix some of tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 17:04:49 +02:00
Dmitriy Zaporozhets
87e6786aa0
Merge branch 'rs-fix-coverage' into 'master'
...
Move coverage-related setup back to spec_helper
These tools must be loaded before our regular Rails environment.
Partially reverts 57830201a9
See merge request !976
2015-07-14 09:03:03 +00:00
Robert Speicher
ce02bf9900
Move coverage-related setup back to spec_helper
...
These tools must be loaded before our regular Rails environment.
2015-07-13 22:41:47 -04:00
Robert Speicher
f3d4767d0c
Rename `notice_added_references` to `create_new_cross_references!`
2015-07-13 21:31:16 -04:00
Robert Speicher
cf7c57aaf5
Use stub_application_setting in a few more specs
...
These specs also failed when run by themselves before this change, so
we've likely got some kind of cross-test contamination going on.
2015-07-06 22:39:56 -04:00
Robert Speicher
42b643f057
Fix ApplicationHelper specs
...
There were several specs that were failing when run by themselves.
- Use the `helper` object, as per RSpec 3 standards
- Use `assign` to assign instance variables that helpers expect
- Add `StubConfiguration` support module
2015-06-30 17:47:53 -04:00
Robert Speicher
366799bbf1
Add spec/support/factory_girl
...
Just for consistency with our Capybara, DatabaseCleaner, WebMock, etc.
setups.
2015-06-30 17:47:53 -04:00
Dmitriy Zaporozhets
779646ef38
Fix rubocop issues after merge of recent master
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-23 10:46:29 +02:00
Dmitriy Zaporozhets
f40b99d02e
Merge branch 'master' into rubocop-for-tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
spec/features/issues_spec.rb
spec/models/forked_project_link_spec.rb
spec/models/hooks/service_hook_spec.rb
spec/models/hooks/web_hook_spec.rb
spec/models/project_services/hipchat_service_spec.rb
spec/requests/api/project_members_spec.rb
spec/requests/api/projects_spec.rb
spec/requests/api/system_hooks_spec.rb
spec/services/archive_repository_service_spec.rb
spec/support/matchers.rb
spec/tasks/gitlab/backup_rake_spec.rb
2015-06-23 10:44:03 +02:00
Stan Hu
9369adb93d
Fix Style/NonNilCheck cop violations
2015-06-22 22:26:41 -07:00
Robert Speicher
0bb320cfda
Fix Style/HashSyntax violations
2015-06-22 14:54:33 -04:00
Robert Speicher
4dbf118a16
Fix Style/Not cop violations
2015-06-22 14:52:41 -04:00
Robert Speicher
1dd42da802
Add sleep call before yield in allowing_for_delay
...
This is to give pending AJAX requests time to complete before we
navigate away, for example.
2015-06-22 12:13:49 +02:00
Robert Speicher
8b1f1ab32e
Remove junk from db_cleaner spec support file
2015-06-22 12:13:47 +02:00
Robert Speicher
da135119aa
Move CapybaraHelpers to its own support file
...
In case we end up wanting to use it in Spinach as well.
2015-06-22 12:13:47 +02:00
Robert Speicher
2120e2dd95
Replace remaining references to `Note.create_cross_reference_note`
2015-06-22 12:13:46 +02:00
Robert Speicher
1f7490a23f
Update spec/features/security specs
2015-06-22 12:13:46 +02:00
Robert Speicher
5a9ede4721
Update mock and stub syntax for specs
2015-06-22 12:13:46 +02:00
Robert Speicher
9874cf5953
Fix include_module matcher
2015-06-22 12:13:46 +02:00
Stan Hu
e785b9d2e2
Fix Error 500 when one user attempts to access a personal, internal snippet
...
Closes #1815
2015-06-19 21:23:46 -07:00
Robert Speicher
b00f447db4
Add `allowing_for_delay` helper method for feature specs
2015-06-14 20:33:29 -04:00
Robert Speicher
44d6815999
Allow login_as helper to accept a User object
2015-06-13 17:58:15 -04:00
Robert Speicher
1f9a2ab7c9
Memoize result of JSON.parse in json_response
...
This might see a minor speedup in test cases that call this method many
times.
2015-06-10 01:31:27 -04:00
Robert Speicher
57830201a9
Add spec/support files for WebMock and test coverage
2015-06-10 01:31:27 -04:00
Robert Speicher
47251b85e0
ensure_length_of -> validate_length_of
2015-06-10 01:31:26 -04:00
Dmitriy Zaporozhets
79aac2c128
Merge branch 'ignore-references' into 'master'
...
Don't notify users mentioned in code blocks or blockquotes.
cc @rspeicher
See merge request !753
2015-06-02 18:39:18 +00:00
Robert Speicher
79c4e3899f
Rename ReferenceFilterSpecHelper to FilterSpecHelper
...
And make it more generalized for all filter specs.
2015-06-02 13:27:53 -04:00
Douwe Maan
a916936f3f
Fix spec.
2015-06-02 15:00:51 +02:00
Robert Speicher
94af050117
Use `to_reference` in reference filter specs
2015-05-26 15:48:32 -04:00
Robert Speicher
91eb346de6
Add invalidate_reference to ReferenceFilterSpecHelper
2015-05-26 15:48:31 -04:00