diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-01-26 22:12:53 -0800 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-01-26 22:12:53 -0800 |
| commit | 0da59cb55bfc8b6bb50f45d0ccdb19edc8b0a6e9 (patch) | |
| tree | 52a372f621a96f5261f926968141313f29cf6da3 /features/project | |
| parent | 33913f9b8fef1f8df45dc26239faf8fa4cffc982 (diff) | |
| parent | e6b97d09470b01b5b65e87dab339c500f1bac45f (diff) | |
| download | gitlab-ce-0da59cb55bfc8b6bb50f45d0ccdb19edc8b0a6e9.tar.gz | |
Merge branch 'master' into move_external_issue_tracker_away_from_yml_config
Conflicts:
app/models/project.rb
spec/models/project_spec.rb
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/project.feature | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/features/project/project.feature b/features/project/project.feature index 7bb24e013a9..3e1fd54bee8 100644 --- a/features/project/project.feature +++ b/features/project/project.feature @@ -5,6 +5,19 @@ Feature: Project And project "Shop" has push event And I visit project "Shop" page + Scenario: I edit the project avatar + Given I visit edit project "Shop" page + When I change the project avatar + And I should see new project avatar + And I should see the "Remove avatar" button + + Scenario: I remove the project avatar + Given I visit edit project "Shop" page + And I have an project avatar + When I remove my project avatar + Then I should see the default project avatar + And I should not see the "Remove avatar" button + @javascript Scenario: I should see project activity When I visit project "Shop" page |