zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-04 00:42:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:internetee/registry

Browse source 
Conflicts:
	db/schema.rb
This commit is contained in:
Andres Keskküla 2014-12-01 11:29:59 +02:00
commit 907ef1edf7
33 changed files with 629 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/features/sessions_spec.rb
View file

@ -14,9 +14,9 @@ feature 'Sessions', type: :feature do
scenario 'Admin logs in' do
visit root_path
expect(page).to have_button('ID card (gitlab)')
expect(page).to have_button('ID card (user1)')
click_on 'ID card (gitlab)'
click_on 'ID card (user1)'
expect(page).to have_text('Welcome!')
uri = URI.parse(current_url)

2
spec/features/setting_management_spec.rb
View file

@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Setting management', type: :feature do
let(:zone) { Fabricate(:registrar) }
let(:zone_user) { Fabricate(:user, registrar: zone, username: 'gitlab', admin: true, identity_code: '37810013087') }
let(:zone_user) { Fabricate(:user, registrar: zone, username: 'user1', admin: true, identity_code: '37810013087') }
background { create_settings }