Merge branch 'preview' into ReservedInstance

Author: corquiri

src/ResourceManager/Resources/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 ## Current Release
 * Set minimum dependency of module to PowerShell 5.0
+* Remove obsolete parameter -AtScopeAndBelow from Get-AzureRmRoledefinition call
 
 ## Version 5.5.2
 * Updated to the latest version of the Azure ClientRuntime

src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

@@ -710,9 +710,6 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleDefinitionTests\RDRemoveScenario.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleDefinitionTests\RDGetAtScopeFilterRoles.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleDefinitionTests\RDDataActionsNegativeTestCases.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleDefinitionTests.cs

@@ -91,13 +91,6 @@ public void RDGetCustomRoles()
             ResourcesController.NewInstance.RunPsTest("Test-RDGetCustomRoles");
         }
 
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void RDGetAtScopeFilterRoles()
-        {
-            ResourcesController.NewInstance.RunPsTest("Test-RDGetAtScopeFilterRoles");
-        }
-
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RDDataActionsNegativeTestCases()

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleDefinitionTests.ps1

@@ -339,29 +339,6 @@ function Test-RDGetCustomRoles
     Remove-AzureRmRoleDefinition -Id $rd.Id -Force
 }
 
-<#
-.SYNOPSIS
-Tests verify scenarios for RoleDefinitions creation.
-#>
-function Test-RDGetAtScopeFilterRoles
-{
-    # Setup
-    # Basic positive case - read from file
-    $rdName = 'Another tests role'
-    [Microsoft.Azure.Commands.Resources.Models.Authorization.AuthorizationClient]::RoleDefinitionNames.Enqueue("3d95b97a-5745-4c39-950c-0b608dea635f")
-    $rd = New-AzureRmRoleDefinition -InputFile .\Resources\RoleDefinition.json
-    
-    $rd = Get-AzureRmRoleDefinition -Name $rdName -AtScopeAndBelow
-    Assert-AreEqual "Test role" $rd.Description 
-    Assert-AreEqual $true $rd.IsCustom
-    Assert-NotNull $rd.AssignableScopes
-    Assert-NotNull $rd.Actions
-    Assert-NotNull $rd.NotActions
-    
-    # Basic positive case - read from object
-    Remove-AzureRmRoleDefinition -Id $rd.Id -Force
-}
-
 <#
 .SYNOPSIS
 Tests validate input parameters