jgaunt/ImportExcel
1
0
Fork 0
mirror of https://github.com/dfinke/ImportExcel.git synced 2025-12-06 00:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove test, put check in begin block

Browse Source
This commit is contained in:
dfinke
2019-07-04 11:59:15 -04:00
parent 7faa27a3b3
commit 25fb76d9b7
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ImportExcel.psm1
View File

@@ -300,6 +300,16 @@ function Import-Excel {
)
begin {
$sw = [System.Diagnostics.Stopwatch]::StartNew()
# $Path = (Resolve-Path $Path).ProviderPath
$resolvedPath = (Resolve-Path $Path -ErrorAction SilentlyContinue)
if ($resolvedPath) {
$Path = $resolvedPath.ProviderPath
}
else {
throw "'$($Path)' file not found"
}
Function Get-PropertyNames {
<#
.SYNOPSIS
@@ -346,14 +356,6 @@ function Import-Excel {
process {
if ($path) {
# $Path = (Resolve-Path $Path).ProviderPath
$resolvedPath = (Resolve-Path $Path -ErrorAction SilentlyContinue)
if ($resolvedPath) {
$Path = $resolvedPath.ProviderPath
}
else {
throw "'$($Path)' file not found"
}
$stream = New-Object -TypeName System.IO.FileStream -ArgumentList $Path, 'Open', 'Read', 'ReadWrite'
if ($Password) { $ExcelPackage = New-Object -TypeName OfficeOpenXml.ExcelPackage -ArgumentList $stream , $Password }

8
__tests__/RelativePath.tests.ps1
View File

@@ -19,10 +19,10 @@
$actual | Should Not Be $null
}
It "Should read with PSScriptRoot" {
$actual = Import-Excel -Path "$PSScriptRoot\$($script:xlfileName)"
$actual | Should Not Be $null
}
# It "Should read with PSScriptRoot" {
# $actual = Import-Excel -Path "$PSScriptRoot\$($script:xlfileName)"
# $actual | Should Not Be $null
# }
It "Should read with just a file name and resolve to cwd" {
$actual = Import-Excel -Path "$($script:xlfileName)"