Produced by Araxis Merge on 10/4/2017 8:04:41 AM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | rdk.zip\rdk\product\tests\acceptance-tests\features\steps | permissions-add-inv.rb | Mon Aug 21 12:51:08 2017 UTC |
| 2 | rdk.zip\rdk\product\tests\acceptance-tests\features\steps | permissions-add-inv.rb | Tue Oct 3 20:11:53 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 8 | 428 |
| Changed | 7 | 14 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | After('@Re move_all_P ermission_ Sets_Indiv idual') do | scenari o | | |
| 2 | expect(@ save_singl e_to_repla ce).to_not be_nil, " Expected s cenario @R emove_all_ Permission _Sets_Indi vidual to set variab le @save_s ingle_to_r eplace for clean up" | |
| 3 | # Adding random pe rmissions | |
| 4 | permissi on_name = 'intern' | |
| 5 | addition al_permiss ions = 're view-resul t-consult- order' | |
| 6 | request = RDKQuery .new('perm ission-set s-bulk-edi t') | |
| 7 | ||
| 8 | request. add_parame ter('users ', @save_s ingle_to_r eplace.to_ json) | |
| 9 | request. add_parame ter('permi ssionSets' , [permiss ion_name]. to_s) | |
| 10 | request. add_parame ter('addit ionalPermi ssions', [ additional _permissio ns].to_s) | |
| 11 | request. add_parame ter('mode' , 'add') | |
| 12 | ||
| 13 | path = r equest.pat h | |
| 14 | ||
| 15 | # reset to nil so don't acci dently res use | |
| 16 | @save_si ngle_to_re place = ni l | |
| 17 | @response = HTTParty RDK.put_as _user(path , " R E D A CTED ; DNS ", " REDACTED ") | |
| 18 | expect(@ response.c ode).to eq (200), "Wa s not able to reset permission s, next te st run may fail: #{@ response.b ody}" | |
| 19 | end | |
| 20 | ||
| 21 | After('@mu tli_user_r emove_all' ) do | sce nario | | |
| 22 | expect(@ save_bulk_ to_replace ).to_not b e_nil, "Ex pected sce nario @mut li_user_re move_all t o set vari able @save _bulk_to_r eplace for clean up" | |
| 23 | permissi on_name = 'intern' | |
| 24 | request = RDKQuery .new('perm ission-set s-bulk-edi t') | |
| 25 | ||
| 26 | request. add_parame ter('users ', @save_b ulk_to_rep lace.to_js on) | |
| 27 | request. add_parame ter('permi ssionSets' , [permiss ion_name]. to_s) | |
| 28 | request. add_parame ter('addit ionalPermi ssions', [ ].to_s) | |
| 29 | request. add_parame ter('mode' , 'add') | |
| 30 | ||
| 31 | path = r equest.pat h | |
| 32 | # reset to nil so don't acci dently res use | |
| 33 | @save_bu lk_to_repl ace = nil | |
| 34 | @response = HTTParty RDK.put_as _user(path , " R E D A CTED ; DNS ", " REDACTED ") | |
| 35 | expect(@ response.c ode).to eq (200), "Wa s not able to reset permission s, next te st run may fail: #{@ response.b ody}" | |
| 36 | end | |
| 37 | ||
| 38 | When(/^cli ent update s single u ser to rem ove all pe rmissions$ /) do |tab le| | |
| 39 | query = RDKQuery.n ew('permis sion-sets- edit') | |
| 40 | user_has h = {} | |
| 41 | table.ro ws.each do | key, va lue | | |
| 42 | user_h ash[key] = value | |
| 43 | end | |
| 44 | ||
| 45 | user_has h['permiss ions'] = [ ] | |
| 46 | query.ad d_paramete r('user', user_hash. to_json) | |
| 47 | query.ad d_paramete r('permiss ionSets', [].to_s) | |
| 48 | query.ad d_paramete r('additio nalPermiss ions', []. to_s) | |
| 49 | path = q uery.path | |
| 50 | @response = HTTParty RDK.put_as _user(path , " R E D A CTED ; DNS ", " REDACTED ") | |
| 51 | end | |
| 52 | ||
| 53 | class Perm issionsAct ions | |
| 54 | extend : :RSpec::Ma tchers | |
| 55 | def self .get_user_ permission s(firstnam e, lastnam e, inactiv e = false) | |
| 56 | reques t = RDKQue ry.new('us er-service -userlist' ) | |
| 57 | user_h ash = { 'f irstName' => firstna me, 'lastN ame' => la stname } | |
| 58 | reques t.add_para meter('use r.filter', user_hash .to_json) | |
| 59 | reques t.add_para meter('pag e', '1') | |
| 60 | reques t.add_para meter('lim it', '50') | |
| 61 | reques t.add_para meter('sho w.vista.in active', ' true') if inactive | |
| 62 | reques t.add_para meter('sho w.ehmp.ina ctive', 't rue') if i nactive | |
| 63 | path = request.p ath | |
| 64 | HTTPartyRD K.get_as_u ser(path, " R E D A CTED ; DNS ", " REDACTED ") | |
| 65 | end | |
| 66 | ||
| 67 | def self .parse_per mission_se ts(user_ha sh) | |
| 68 | expect (user_hash ['permissi onSet']).t o_not be_n il, "permi ssionSet n il: #{user _hash}" | |
| 69 | expect (user_hash ['permissi onSet']['v al']).to_n ot be_nil, "permissi onSet, val nil: #{us er_hash}" | |
| 70 | user_h ash['permi ssionSet'] ['val'] | |
| 71 | end | |
| 72 | ||
| 73 | def self .parse_add itional_se ts(user_ha sh) | |
| 74 | expect (user_hash ['permissi onSet']).t o_not be_n il, "permi ssionSet n il: #{user _hash}" | |
| 75 | expect (user_hash ['permissi onSet']['a dditionalP ermissions ']).to_not be_nil, " permission Set, addit ionalPermi ssions nil : #{user_h ash}" | |
| 76 | user_h ash['permi ssionSet'] ['addition alPermissi ons'] | |
| 77 | end | |
| 78 | end | |
| 79 | ||
| 80 | Given(/^a user has a t least 1 permission set and 1 additiona l permissi on for use r "([^"]*) ", "([^"]* )"$/) do | lastname, firstname| | |
| 81 | @respons e = Permis sionsActio ns.get_use r_permissi ons firstn ame, lastn ame, true | |
| 82 | expect(@ response.c ode).to eq (200), "#{ @response. body}" | |
| 83 | body = J SON.parse( @response. body) | |
| 84 | expect(b ody['data' ]).to_not be_nil | |
| 85 | expect(b ody['data' ].length). to eq(1) | |
| 86 | set_arra y = Permis sionsActio ns.parse_p ermission_ sets body[ 'data'][0] | |
| 87 | addition al_array = Permissio nsActions. parse_addi tional_set s body['da ta'][0] | |
| 88 | ||
| 89 | expect(s et_array.l ength).to be > 0 | |
| 90 | expect(a dditional_ array.leng th).to be > 0 | |
| 91 | end | |
| 92 | ||
| 93 | Given(/^us er "([^"]* )", "([^"] *)" does n ot have pe rmission s et "([^"]* )"$/) do | lastname, firstname, permissio n_name| | |
| 94 | @respons e = Permis sionsActio ns.get_use r_permissi ons firstn ame, lastn ame, true | |
| 95 | expect(@ response.c ode).to eq (200), "#{ @response. body}" | |
| 96 | body = J SON.parse( @response. body) | |
| 97 | expect(b ody['data' ]).to_not be_nil | |
| 98 | expect(b ody['data' ].length). to eq(1) | |
| 99 | set_arra y = Permis sionsActio ns.parse_p ermission_ sets body[ 'data'][0] | |
| 100 | ||
| 101 | expect(s et_array). to_not inc lude permi ssion_name | |
| 102 | end | |
| 103 | ||
| 104 | When(/^cli ent update s users to add permi ssion set "([^"]*)"$ /) do |per mission_na me, table| | |
| 105 | request = RDKQuery .new('perm ission-set s-bulk-edi t') | |
| 106 | user_arr ay = [] | |
| 107 | table.ro ws.each do | first, last, uid | | |
| 108 | user_h ash = { 'f name' => f irst.upcas e, 'lname' => last.u pcase, 'ui d' => uid } | |
| 109 | user_a rray.push( user_hash) #.to_json) | |
| 110 | end | |
| 111 | request. add_parame ter('users ', user_ar ray.to_jso n) | |
| 112 | request. add_parame ter('permi ssionSets' , [permiss ion_name]. to_s) | |
| 113 | request. add_parame ter('addit ionalPermi ssions', [ ].to_s) | |
| 114 | request. add_parame ter('mode' , 'add') | |
| 115 | ||
| 116 | path = r equest.pat h | |
| 117 | @response = HTTParty RDK.put_as _user(path , " R E D A CTED ; DNS ", " REDACTED ") | |
| 118 | end | |
| 119 | ||
| 120 | When(/^cli ent update s users to remove pe rmission s et "([^"]* )"$/) do | permission _name, tab le| | |
| 121 | request = RDKQuery .new('perm ission-set s-bulk-edi t') | |
| 122 | user_arr ay = [] | |
| 123 | table.ro ws.each do | first, last, uid | | |
| 124 | user_h ash = { 'f name' => f irst.upcas e, 'lname' => last.u pcase, 'ui d' => uid } | |
| 125 | user_a rray.push( user_hash) | |
| 126 | end | |
| 127 | request. add_parame ter('users ', user_ar ray.to_jso n) | |
| 128 | request. add_parame ter('permi ssionSets' , [permiss ion_name]. to_s) | |
| 129 | request. add_parame ter('addit ionalPermi ssions', [ ].to_s) | |
| 130 | request. add_parame ter('mode' , 'remove' ) | |
| 131 | ||
| 132 | path = r equest.pat h | |
| 133 | @response = HTTParty RDK.put_as _user(path , " R E D A CTED ; DNS ", " REDACTED ") | |
| 134 | end | |
| 135 | ||
| 136 | Then(/^use r "([^"]*) ", "([^"]* )" has per mission se t "([^"]*) "$/) do |l astname, f irstname, permission _name| | |
| 137 | @respons e = Permis sionsActio ns.get_use r_permissi ons firstn ame, lastn ame | |
| 138 | expect(@ response.c ode).to eq (200), "#{ @response. body}" | |
| 139 | body = J SON.parse( @response. body) | |
| 140 | expect(b ody['data' ]).to_not be_nil | |
| 141 | expect(b ody['data' ].length). to eq(1) | |
| 142 | set_arra y = Permis sionsActio ns.parse_p ermission_ sets body[ 'data'][0] | |
| 143 | ||
| 144 | expect(s et_array). to include permissio n_name | |
| 145 | end | |
| 146 | ||
| 147 | Given(/^us er "([^"]* )", "([^"] *)" has at least one permissio n \( set o r individu al \)$/) d o |lastnam e, firstna me| | |
| 148 | @respons e = Permis sionsActio ns.get_use r_permissi ons firstn ame, lastn ame | |
| 149 | expect(@ response.c ode).to eq (200), "#{ @response. body}" | |
| 150 | body = J SON.parse( @response. body) | |
| 151 | expect(b ody['data' ]).to_not be_nil | |
| 152 | expect(b ody['data' ].length). to eq(1) | |
| 153 | set_arra y = Permis sionsActio ns.parse_p ermission_ sets body[ 'data'][0] | |
| 154 | addition al_array = Permissio nsActions. parse_addi tional_set s body['da ta'][0] | |
| 155 | ||
| 156 | combined _permissio ns = set_a rray + add itional_ar ray | |
| 157 | ||
| 158 | expect(c ombined_pe rmissions. length).to be > 0 | |
| 159 | end | |
| 160 | ||
| 161 | Then(/^use r "([^"]*) ", "([^"]* )" has no permission s$/) do |l astname, f irstname| | |
| 162 | @respons e = Permis sionsActio ns.get_use r_permissi ons firstn ame, lastn ame, true | |
| 163 | expect(@ response.c ode).to eq (200), "#{ @response. body}" | |
| 164 | body = J SON.parse( @response. body) | |
| 165 | expect(b ody['data' ]).to_not be_nil | |
| 166 | expect(b ody['data' ].length). to eq(1) | |
| 167 | set_arra y = Permis sionsActio ns.parse_p ermission_ sets body[ 'data'][0] | |
| 168 | addition al_array = Permissio nsActions. parse_addi tional_set s body['da ta'][0] | |
| 169 | ||
| 170 | expect(s et_array.l ength).to eq(0) | |
| 171 | expect(a dditional_ array.leng th).to eq( 0) | |
| 172 | end | |
| 173 | ||
| 174 | When(/^cli ent update s users to remove al l permissi ons$/) do |table| | |
| 175 | request = RDKQuery .new('perm ission-set s-bulk-edi t') | |
| 176 | user_arr ay = [] | |
| 177 | set_to_r emove = [] | |
| 178 | add_perm _to_remove =[] | |
| 179 | ||
| 180 | table.ro ws.each do | first, last, uid | | |
| 181 | user_h ash = { 'f name' => f irst.upcas e, 'lname' => last.u pcase, 'ui d' => uid } | |
| 182 | user_a rray.push( user_hash) | |
| 183 | ||
| 184 | @respo nse = Perm issionsAct ions.get_u ser_permis sions firs t, last, t rue | |
| 185 | expect (@response .code).to eq(200), " #{@respons e.body}" | |
| 186 | ||
| 187 | body = JSON.pars e(@respons e.body) | |
| 188 | expect (body['dat a']).to_no t be_nil | |
| 189 | expect (body['dat a'].length ).to eq(1) | |
| 190 | set_ar ray = Perm issionsAct ions.parse _permissio n_sets bod y['data'][ 0] | |
| 191 | additi onal_array = Permiss ionsAction s.parse_ad ditional_s ets body[' data'][0] | |
| 192 | ||
| 193 | set_to _remove += set_array | |
| 194 | add_pe rm_to_remo ve += addi tional_arr ay | |
| 195 | end | |
| 196 | request. add_parame ter('users ', user_ar ray.to_jso n) | |
| 197 | request. add_parame ter('permi ssionSets' , Set.new( set_to_rem ove).to_a. to_s) | |
| 198 | request. add_parame ter('addit ionalPermi ssions', S et.new(add _perm_to_r emove).to_ a.to_s) | |
| 199 | request. add_parame ter('mode' , 'remove' ) | |
| 200 | ||
| 201 | path = r equest.pat h | |
| 202 | @response = HTTParty RDK.put_as _user(path , " R E D A CTED ; DNS ", " REDACTED ") | |
| 203 | end | |
| 204 | ||
| 205 | Given(/^cl ient is si ngle updat ing permis sions for$ /) do |tab le| | |
| 206 | p "Save user to re place perm issions af ter test" | |
| 207 | @save_si ngle_to_re place = [] | |
| 208 | table.ro ws.each do | first, last, uid | | |
| 209 | user_h ash = { 'f name' => f irst.upcas e, 'lname' => last.u pcase, 'ui d' => uid } | |
| 210 | @save_ single_to_ replace.pu sh(user_ha sh) | |
| 211 | end | |
| 212 | end | |
| 213 | ||
| 214 | Given(/^cl ient is bu lk updatin g permissi ons for$/) do |table | | |
| 215 | p "Save user to re place perm issions af ter test" | |
| 216 | @save_bu lk_to_repl ace = [] | |
| 217 | table.ro ws.each do | first, last, uid | | |
| 218 | user_h ash = { 'f name' => f irst.upcas e, 'lname' => last.u pcase, 'ui d' => uid } | |
| 219 | @save_ bulk_to_re place.push (user_hash ) | |
| 220 | end | |
| 221 | end |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.