Commit Graph
234 Commits
Author SHA1 Message Date
Robert Speicher 2930041886 Make sure the gfm helper passes the required options
This adds some duplication, but this helper is temporary.
2015-08-31 18:09:18 -04:00
Robert Speicher 4340dd3eeb Decouple Gitlab::Markdown from the GitlabMarkdownHelper
This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).
2015-08-27 14:17:26 -07:00
Robert Speicher c401543d02 Fix failing spec 2015-08-25 15:57:55 -07:00
Robert Speicher 2c3e42e4a4 Remove user_color_scheme_class
Instead of rendering this value server-side, we use Javascript and Gon
to apply the user's color scheme (or the default) to any syntax
highlighted code blocks.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.
2015-08-25 15:32:38 -07:00
Robert Speicher 907860ed3d Remove the gfm_with_options helper
It was redundant because `gfm` also took options.
2015-08-12 23:32:16 -04:00
Douwe Maan 674e1c7458 Fix spec 2015-08-06 17:15:37 +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
Robert Speicher 97cedc5d1b Break up SanitizationFilter feature specs 2015-07-28 18:56:26 -04:00
Robert Speicher 3cafa74387 Use aggregate_failures where appropriate 2015-07-28 18:56:26 -04:00
Robert Speicher 06478ef3ec Minor Markdown feature spec reorganization 2015-07-28 18:56:26 -04:00
Robert Speicher b07ecbb5e3 Simplify AutolinkFilter specs 2015-07-28 18:56:26 -04:00
Stan Hu 5bdcef7b0b Change before(:all) -> let! to avoid leaking data across tests
Closes https://github.com/gitlabhq/gitlabhq/issues/9495
2015-07-28 13:06:13 -07:00
Robert Speicher b42422a7a9 Move spec/features/admin/security_spec to spec/features/security 2015-07-22 00:39:18 -04:00
Robert Speicher b24d5f13a5 Consolidate group access specs into one file 2015-07-22 00:01:17 -04:00
Robert Speicher ff8811c40b Remove redundant Profile access test cases
The user being created was no different than what `be_allowed_for` was
doing behind the scenes so we were essentially testing all user-level
accesses twice.
2015-07-22 00:01:17 -04:00
Robert Speicher 421b06508d Remove be_not_found_for matcher
It was only used in one test, and the test was kind of redundant.
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 db8f4c0606 Add a button to Admin::Users#show to disable 2FA for that user 2015-07-10 17:18:33 -04:00
Stan HuandRobert Speicher 098ced4faa Improve features to ensure Ajax filter has actually executed 2015-07-08 15:57:24 -04:00
Robert Speicher 098ad0a5b4 Remove "mystery guest" from Milestone filtering features 2015-07-08 15:49:37 -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 4b4351a18c Add feature tag to feature specs
Not to be confused with the RSpec `type: :feature` tag, this tag is used
by the `spec:feature` Rake task for filtering/grouping specs.
2015-07-06 22:39:55 -04:00
Robert Speicher d00cb00d6b Rename NoMilestone to Milestone::None
Also refactors IssuableFinder to avoid redundant title check.
2015-07-06 22:39:55 -04:00
Robert Speicher cfd813402d Remove duplicate feature spec for filtering issues by no milestone 2015-07-06 22:39:55 -04:00
Robert Speicher 3ee3cb24d4 Allow user to filter by Issues/Merge Requests without a Milestone 2015-07-06 22:39:55 -04:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Dmitriy Zaporozhets a5b54f919a Reporter role can manage issue tracker now
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 13:33:02 +02:00
Dmitriy Zaporozhets 06ab7d89f9 Merge branch 'rs-issue-1887' into 'master'
Reorder MergeRequestTabs constructor

The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.

Fixes #1887

See merge request !892
2015-06-26 16:17:07 +00:00
Dmitriy Zaporozhets b9fa82daee Update tests and use js-issuable class for context form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:05:30 +02:00
Robert Speicher e14d517b61 Fix merge request diff features 2015-06-25 21:30:18 -04:00
Dmitriy Zaporozhets 883438970d Merge branch 'rubocop-for-tests' into 'master'
Enable rubocop for tests too

cc @DouweM @rspeicher

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !862
2015-06-23 10:36:36 +00:00
Dmitriy Zaporozhets f189c36d8d Merge branch 'rs-dev-issue-2414' into 'master'
Allow Admin to filter users by 2FA status

> ![Screen_Shot_2015-06-19_at_4.38.12_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/deba7f2a6b8d1548c1d1ac401e0e35a1/Screen_Shot_2015-06-19_at_4.38.12_PM.png)

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414

See merge request !852
2015-06-23 08:48:22 +00: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 359ed48638 Fix Style/AlignHash cop violations 2015-06-22 22:24:39 -07:00
Robert Speicher 15a05be70d Fix Style/Blocks cop violations 2015-06-22 16:00:54 -04:00
Robert Speicher 8832839291 Fix Style/CommentIndentation cop violation 2015-06-22 14:56:48 -04:00
Robert Speicher 0bb320cfda Fix Style/HashSyntax violations 2015-06-22 14:54:33 -04:00
Robert Speicher 56246b70fb Fix Style/TrailingBlankLines cop violations 2015-06-22 14:38:33 -04:00
Robert SpeicherandDmitriy Zaporozhets bf71d53f63 Change to_not calls to not_to
Both work, but now we're consistent across the entire app.
2015-06-22 12:13:49 +02:00
Robert SpeicherandDmitriy Zaporozhets 1f7490a23f Update spec/features/security specs 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets 5a9ede4721 Update mock and stub syntax for specs 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets afec5efc7d Fix features syntax 2015-06-22 12:13:45 +02:00
Robert Speicher 516b4c1248 Allow Admin to filter users by 2FA status 2015-06-19 16:35:53 -04:00
Robert Speicher 22dd2240a6 Add 2FA status to Admin::Users#show 2015-06-19 15:04:47 -04:00
swellard 98615ef536 Fix duplicate 'Email has already been taken' message when creating a user 2015-06-16 14:24:05 +01:00
Dmitriy Zaporozhets 7300729190 Merge branch 'rs-dev-issue-2228' into 'master'
Allow user to customize default Dashboard page

Renames the "Design" profile page to "Preferences" and adds a field to customize the default Dashboard page:

> ![Screen_Shot_2015-06-11_at_11.12.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5282a3be7861d1148528c6bc9e7a0e0/Screen_Shot_2015-06-11_at_11.12.53_PM.png)

See merge request !778
2015-06-15 11:29:36 +00:00
Robert Speicher b00f447db4 Add allowing_for_delay helper method for feature specs 2015-06-14 20:33:29 -04:00
Robert Speicher 37066267e7 Use page.all and page.within in specs 2015-06-13 18:37:30 -04:00