Fix specs
This commit is contained in:
parent
94919b4724
commit
0278b91203
13 changed files with 30 additions and 25 deletions
|
@ -48,8 +48,8 @@ import _ from 'underscore';
|
|||
});
|
||||
|
||||
function applyScrollNavClass() {
|
||||
$('.navbar-border').css("opacity", $(window).scrollTop() / 40);
|
||||
$('.navbar-border').css('opacity', $(window).scrollTop() / 40);
|
||||
}
|
||||
|
||||
$(window).scroll( _.throttle(applyScrollNavClass, 100));
|
||||
$(window).scroll(_.throttle(applyScrollNavClass, 100));
|
||||
}).call(window);
|
||||
|
|
|
@ -32,7 +32,8 @@ header {
|
|||
border-bottom: 1px solid $border-color;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
@media (max-width: $screen-xs-min) {
|
||||
padding: 0 16px;
|
||||
|
|
|
@ -9,6 +9,7 @@ Feature: Search
|
|||
Given I search for "Sho"
|
||||
Then I should see "Shop" project link
|
||||
|
||||
@javascript
|
||||
Scenario: I should see issues I am looking for
|
||||
And project has issues
|
||||
When I search for "Foo"
|
||||
|
@ -16,6 +17,7 @@ Feature: Search
|
|||
Then I should see "Foo" link in the search results
|
||||
And I should not see "Bar" link in the search results
|
||||
|
||||
@javascript
|
||||
Scenario: I should see merge requests I am looking for
|
||||
And project has merge requests
|
||||
When I search for "Foo"
|
||||
|
@ -23,6 +25,7 @@ Feature: Search
|
|||
Then I should see "Foo" link in the search results
|
||||
And I should not see "Bar" link in the search results
|
||||
|
||||
@javascript
|
||||
Scenario: I should see milestones I am looking for
|
||||
And project has milestones
|
||||
When I search for "Foo"
|
||||
|
@ -78,6 +81,7 @@ Feature: Search
|
|||
And I search for "Sho"
|
||||
Then I should see "Shop" project link
|
||||
|
||||
@javascript
|
||||
Scenario: I logout and should see issues I am looking for
|
||||
Given project "Shop" is public
|
||||
And I logout directly
|
||||
|
|
|
@ -55,7 +55,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
|
|||
merge_request_reference = merge_request.to_reference(full: true)
|
||||
issue_reference = issue.to_reference(full: true)
|
||||
|
||||
click_link 'Mark all as done'
|
||||
find('.js-todos-mark-all').trigger('click')
|
||||
|
||||
page.within('.todos-count') { expect(page).to have_content '0' }
|
||||
expect(page).to have_content 'To do 0'
|
||||
|
@ -69,7 +69,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I should see the todo marked as done' do
|
||||
click_link 'Done 1'
|
||||
find('.todos-done a').trigger('click')
|
||||
|
||||
expect(page).to have_link project.name_with_namespace
|
||||
should_see_todo(1, "John Doe assigned you merge request #{merge_request.to_reference(full: true)}", merge_request.title, state: :done_irreversible)
|
||||
|
@ -79,7 +79,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
|
|||
merge_request_reference = merge_request.to_reference(full: true)
|
||||
issue_reference = issue.to_reference(full: true)
|
||||
|
||||
click_link 'Done 4'
|
||||
find('.todos-done a').trigger('click')
|
||||
|
||||
expect(page).to have_link project.name_with_namespace
|
||||
should_see_todo(1, "John Doe assigned you merge request #{merge_request_reference}", merge_request.title, state: :done_irreversible)
|
||||
|
|
|
@ -33,7 +33,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I click link "Merged"' do
|
||||
click_link "Merged"
|
||||
find('#state-merged').trigger('click')
|
||||
end
|
||||
|
||||
step 'I click link "Closed"' do
|
||||
|
|
|
@ -10,12 +10,12 @@ class Spinach::Features::Search < Spinach::FeatureSteps
|
|||
|
||||
step 'I search for "Foo"' do
|
||||
fill_in "dashboard_search", with: "Foo"
|
||||
click_button "Search"
|
||||
find('.btn-search').trigger('click')
|
||||
end
|
||||
|
||||
step 'I search for "rspec"' do
|
||||
fill_in "dashboard_search", with: "rspec"
|
||||
click_button "Search"
|
||||
find('.btn-search').trigger('click')
|
||||
end
|
||||
|
||||
step 'I search for "rspec" on project page' do
|
||||
|
@ -25,7 +25,7 @@ class Spinach::Features::Search < Spinach::FeatureSteps
|
|||
|
||||
step 'I search for "Wiki content"' do
|
||||
fill_in "dashboard_search", with: "content"
|
||||
click_button "Search"
|
||||
find('.btn-search').trigger('click')
|
||||
end
|
||||
|
||||
step 'I click "Issues" link' do
|
||||
|
@ -35,7 +35,7 @@ class Spinach::Features::Search < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I click project "Shop" link' do
|
||||
click_button 'Project'
|
||||
find('.js-search-project-dropdown').trigger('click')
|
||||
page.within '.project-filter' do
|
||||
click_link project.name_with_namespace
|
||||
end
|
||||
|
|
|
@ -7,7 +7,7 @@ RSpec.describe 'Dashboard Group', feature: true do
|
|||
|
||||
it 'creates new group', js: true do
|
||||
visit dashboard_groups_path
|
||||
click_link 'New group'
|
||||
find('.btn-new').trigger('click')
|
||||
new_path = 'Samurai'
|
||||
new_description = 'Tokugawa Shogunate'
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ describe 'Profile > Preferences', feature: true do
|
|||
expect(page.current_path).to eq starred_dashboard_projects_path
|
||||
end
|
||||
|
||||
click_link 'Your projects'
|
||||
find('.shortcuts-activity').trigger('click')
|
||||
|
||||
expect(page).not_to have_content("You don't have starred projects yet")
|
||||
expect(page.current_path).to eq dashboard_projects_path
|
||||
|
|
|
@ -17,14 +17,14 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
|
|||
login_as(user)
|
||||
|
||||
visit namespace_project_path(project.namespace, project)
|
||||
click_link 'Wiki'
|
||||
find('.shortcuts-wiki').trigger('click')
|
||||
WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
|
||||
end
|
||||
|
||||
context "while creating a new wiki page" do
|
||||
context "when there are no spaces or hyphens in the page name" do
|
||||
it "rewrites relative links as expected" do
|
||||
click_link 'New page'
|
||||
find('.add-new-wiki').trigger('click')
|
||||
page.within '#modal-new-wiki' do
|
||||
fill_in :new_wiki_path, with: 'a/b/c/d'
|
||||
click_button 'Create page'
|
||||
|
@ -73,7 +73,7 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
|
|||
fill_in :new_wiki_path, with: 'a-page/b-page/c-page/d-page'
|
||||
click_button 'Create page'
|
||||
end
|
||||
|
||||
|
||||
page.within '.wiki-form' do
|
||||
fill_in :wiki_content, with: wiki_content
|
||||
click_on "Preview"
|
||||
|
@ -91,7 +91,7 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
|
|||
|
||||
context "while editing a wiki page" do
|
||||
def create_wiki_page(path)
|
||||
click_link 'New page'
|
||||
find('.add-new-wiki').trigger('click')
|
||||
|
||||
page.within '#modal-new-wiki' do
|
||||
fill_in :new_wiki_path, with: path
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require 'spec_helper'
|
||||
|
||||
feature 'Projects > Wiki > User creates wiki page', feature: true do
|
||||
feature 'Projects > Wiki > User creates wiki page', js: true, feature: true do
|
||||
let(:user) { create(:user) }
|
||||
|
||||
background do
|
||||
|
@ -8,7 +8,7 @@ feature 'Projects > Wiki > User creates wiki page', feature: true do
|
|||
login_as(user)
|
||||
|
||||
visit namespace_project_path(project.namespace, project)
|
||||
click_link 'Wiki'
|
||||
find('.shortcuts-wiki').trigger('click')
|
||||
end
|
||||
|
||||
context 'in the user namespace' do
|
||||
|
|
|
@ -27,7 +27,7 @@ describe "Search", feature: true do
|
|||
end
|
||||
|
||||
it 'shows group name after filtering' do
|
||||
find('.js-search-group-dropdown').click
|
||||
find('.js-search-group-dropdown').trigger('click')
|
||||
wait_for_ajax
|
||||
|
||||
page.within '.search-holder' do
|
||||
|
@ -57,7 +57,7 @@ describe "Search", feature: true do
|
|||
|
||||
it 'shows project name after filtering' do
|
||||
page.within('.project-filter') do
|
||||
find('.js-search-project-dropdown').click
|
||||
find('.js-search-project-dropdown').trigger('click')
|
||||
wait_for_ajax
|
||||
|
||||
click_link project.name_with_namespace
|
||||
|
|
|
@ -251,7 +251,7 @@ describe 'Dashboard Todos', feature: true do
|
|||
describe 'mark all as done', js: true do
|
||||
before do
|
||||
visit dashboard_todos_path
|
||||
click_link 'Mark all as done'
|
||||
find('.js-todos-mark-all').trigger('click')
|
||||
end
|
||||
|
||||
it 'shows "All done" message!' do
|
||||
|
@ -308,9 +308,9 @@ describe 'Dashboard Todos', feature: true do
|
|||
end
|
||||
|
||||
def mark_all_and_undo
|
||||
click_link 'Mark all as done'
|
||||
find('.js-todos-mark-all').trigger('click')
|
||||
wait_for_ajax
|
||||
click_link 'Undo mark all as done'
|
||||
find('.js-todos-undo-all').trigger('click')
|
||||
wait_for_ajax
|
||||
end
|
||||
end
|
||||
|
|
|
@ -20,7 +20,7 @@ describe 'User Callouts', js: true do
|
|||
visit dashboard_projects_path
|
||||
|
||||
within('.user-callout') do
|
||||
find('.close').click
|
||||
find('.close').trigger('click')
|
||||
end
|
||||
|
||||
visit dashboard_projects_path
|
||||
|
|
Loading…
Reference in a new issue